February 2009 - Wine-Commits

Henri Verbeet : dxgi: Create a wined3d swapchain.
by Alexandre Julliard Feb. 24, 2009

Feb. 24, 2009

Module: wine Branch: master Commit: eda929d0104a5a42f54c4be5fc840fe5f477f740 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eda929d0104a5a42f54c4be5f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 24 07:43:02 2009 +0100 dxgi: Create a wined3d swapchain. --- dlls/d3d10core/device.c | 23 ++++++++++- dlls/dxgi/device.c | 33 ++++++++++++++++ dlls/dxgi/dxgi_private.h | 1 + dlls/dxgi/factory.c | 91 ++++++++++++++++++++++++++++++++++++++++---- dlls/dxgi/swapchain.c | 39 +++++++++++++++++++ include/wine/winedxgi.idl | 4 ++ 6 files changed, 179 insertions(+), 12 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 0eeb5d9..0d79808 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -1331,11 +1331,28 @@ static HRESULT STDMETHODCALLTYPE device_parent_CreateVolume(IWineD3DDeviceParent static HRESULT STDMETHODCALLTYPE device_parent_CreateSwapChain(IWineD3DDeviceParent *iface, WINED3DPRESENT_PARAMETERS *present_parameters, IWineD3DSwapChain **swapchain) { - FIXME("iface %p, present_parameters %p, swapchain %p stub!\n", iface, present_parameters, swapchain); + IWineDXGIDevice *wine_device; + HRESULT hr; - return E_NOTIMPL; -} + TRACE("iface %p, present_parameters %p, swapchain %p\n", iface, present_parameters, swapchain); + + hr = IWineD3DDeviceParent_QueryInterface(iface, &IID_IWineDXGIDevice, (void **)&wine_device); + if (FAILED(hr)) + { + ERR("Device should implement IWineDXGIDevice\n"); + return E_FAIL; + } + hr = IWineDXGIDevice_create_swapchain(wine_device, present_parameters, swapchain); + IWineDXGIDevice_Release(wine_device); + if (FAILED(hr)) + { + ERR("Failed to create DXGI swapchain, returning %#x\n", hr); + return hr; + } + + return S_OK; +} const struct IWineD3DDeviceParentVtbl d3d10_wined3d_device_parent_vtbl = { diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index 5c3fdfc..bf079d5 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -280,6 +280,38 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_create_surface(IWineDXGIDevice *ifa return S_OK; } +static HRESULT STDMETHODCALLTYPE dxgi_device_create_swapchain(IWineDXGIDevice *iface, + WINED3DPRESENT_PARAMETERS *present_parameters, IWineD3DSwapChain **wined3d_swapchain) +{ + struct dxgi_device *This = (struct dxgi_device *)iface; + struct dxgi_swapchain *object; + HRESULT hr; + + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); + if (!object) + { + ERR("Failed to allocate DXGI swapchain object memory\n"); + return E_OUTOFMEMORY; + } + + object->vtbl = &dxgi_swapchain_vtbl; + object->refcount = 1; + + hr = IWineD3DDevice_CreateSwapChain(This->wined3d_device, present_parameters, + &object->wined3d_swapchain, (IUnknown *)object, SURFACE_OPENGL); + if (FAILED(hr)) + { + WARN("Failed to create a swapchain, returning %#x\n", hr); + HeapFree(GetProcessHeap(), 0, object); + return hr; + } + *wined3d_swapchain = object->wined3d_swapchain; + + TRACE("Created IDXGISwapChain %p\n", object); + + return S_OK; +} + const struct IWineDXGIDeviceVtbl dxgi_device_vtbl = { /* IUnknown methods */ @@ -300,4 +332,5 @@ const struct IWineDXGIDeviceVtbl dxgi_device_vtbl = /* IWineDXGIAdapter methods */ dxgi_device_get_wined3d_device, dxgi_device_create_surface, + dxgi_device_create_swapchain, }; diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 90ed4dc..54446ef 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -79,6 +79,7 @@ struct dxgi_swapchain { const struct IDXGISwapChainVtbl *vtbl; LONG refcount; + IWineD3DSwapChain *wined3d_swapchain; }; /* IDXGISurface */ diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index 19bc4cf..667b2f7 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -153,25 +153,98 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_GetWindowAssociation(IWineDXGIFact return E_NOTIMPL; } +/* TODO: The DXGI swapchain desc is a bit nicer than WINED3DPRESENT_PARAMETERS, + * change wined3d to use a structure more similar to DXGI. */ static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChain(IWineDXGIFactory *iface, IUnknown *device, DXGI_SWAP_CHAIN_DESC *desc, IDXGISwapChain **swapchain) { - struct dxgi_swapchain *object; + WINED3DPRESENT_PARAMETERS present_parameters; + IWineD3DSwapChain *wined3d_swapchain; + IWineD3DDevice *wined3d_device; + IWineDXGIDevice *dxgi_device; + UINT count; + HRESULT hr; FIXME("iface %p, device %p, desc %p, swapchain %p partial stub!\n", iface, device, desc, swapchain); - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if (!object) + hr = IUnknown_QueryInterface(device, &IID_IWineDXGIDevice, (void **)&dxgi_device); + if (FAILED(hr)) { - ERR("Failed to allocate DXGI swapchain object memory\n"); - return E_OUTOFMEMORY; + ERR("This is not the device we're looking for\n"); + return hr; } - object->vtbl = &dxgi_swapchain_vtbl; - object->refcount = 1; - *swapchain = (IDXGISwapChain *)object; + wined3d_device = IWineDXGIDevice_get_wined3d_device(dxgi_device); + IWineDXGIDevice_Release(dxgi_device); - TRACE("Created IDXGISwapChain %p\n", object); + count = IWineD3DDevice_GetNumberOfSwapChains(wined3d_device); + if (count) + { + FIXME("Only a single swapchain supported.\n"); + IWineD3DDevice_Release(wined3d_device); + return E_FAIL; + } + + if (!desc->OutputWindow) + { + FIXME("No output window, should use factory output window\n"); + } + + FIXME("Ignoring SwapEffect and Flags\n"); + + present_parameters.BackBufferWidth = desc->BufferDesc.Width; + present_parameters.BackBufferHeight = desc->BufferDesc.Height; + present_parameters.BackBufferFormat = wined3dformat_from_dxgi_format(desc->BufferDesc.Format); + present_parameters.BackBufferCount = desc->BufferCount; + if (desc->SampleDesc.Count > 1) + { + present_parameters.MultiSampleType = desc->SampleDesc.Count; + present_parameters.MultiSampleQuality = desc->SampleDesc.Quality; + } + else + { + present_parameters.MultiSampleType = WINED3DMULTISAMPLE_NONE; + present_parameters.MultiSampleQuality = 0; + } + present_parameters.SwapEffect = WINED3DSWAPEFFECT_DISCARD; + present_parameters.hDeviceWindow = desc->OutputWindow; + present_parameters.Windowed = desc->Windowed; + present_parameters.EnableAutoDepthStencil = FALSE; + present_parameters.AutoDepthStencilFormat = 0; + present_parameters.Flags = 0; /* WINED3DPRESENTFLAG_DISCARD_DEPTHSTENCIL? */ + present_parameters.FullScreen_RefreshRateInHz = + desc->BufferDesc.RefreshRate.Numerator / desc->BufferDesc.RefreshRate.Denominator; + present_parameters.PresentationInterval = WINED3DPRESENT_INTERVAL_DEFAULT; + + hr = IWineD3DDevice_Init3D(wined3d_device, &present_parameters); + if (FAILED(hr)) + { + WARN("Failed to initialize 3D, returning %#x\n", hr); + IWineD3DDevice_Release(wined3d_device); + return hr; + } + + hr = IWineD3DDevice_GetSwapChain(wined3d_device, 0, &wined3d_swapchain); + IWineD3DDevice_Release(wined3d_device); + if (FAILED(hr)) + { + WARN("Failed to get swapchain, returning %#x\n", hr); + return hr; + } + + hr = IWineD3DSwapChain_GetParent(wined3d_swapchain, (IUnknown **)swapchain); + IUnknown_Release(wined3d_swapchain); + if (FAILED(hr)) + { + WARN("Failed to get swapchain, returning %#x\n", hr); + return hr; + } + + /* FIXME? The swapchain is created with refcount 1 by the wined3d device, + * but the wined3d device can't hold a real reference. */ + IUnknown_Release(*swapchain); + + TRACE("Created IDXGISwapChain %p\n", *swapchain); return S_OK; } diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 3287c4c..3e9e444 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -56,6 +56,25 @@ static ULONG STDMETHODCALLTYPE dxgi_swapchain_AddRef(IDXGISwapChain *iface) return refcount; } +static ULONG STDMETHODCALLTYPE destroy_surface(IWineD3DSurface *surface) +{ + IDXGISurface *dxgi_surface; + + TRACE("surface %p\n", surface); + + IWineD3DSurface_GetParent(surface, (IUnknown **)&dxgi_surface); + IDXGISurface_Release(dxgi_surface); + + return IDXGISurface_Release(dxgi_surface); +} + +static ULONG STDMETHODCALLTYPE destroy_swapchain(IWineD3DSwapChain *swapchain) +{ + TRACE("swapchain %p\n", swapchain); + + return IWineD3DSwapChain_Release(swapchain); +} + static ULONG STDMETHODCALLTYPE dxgi_swapchain_Release(IDXGISwapChain *iface) { struct dxgi_swapchain *This = (struct dxgi_swapchain *)iface; @@ -65,6 +84,26 @@ static ULONG STDMETHODCALLTYPE dxgi_swapchain_Release(IDXGISwapChain *iface) if (!refcount) { + IWineD3DDevice *wined3d_device; + HRESULT hr; + + FIXME("Only a single swapchain is supported\n"); + + hr = IWineD3DSwapChain_GetDevice(This->wined3d_swapchain, &wined3d_device); + if (FAILED(hr)) + { + ERR("Failed to get the wined3d device, hr %#x\n", hr); + } + else + { + hr = IWineD3DDevice_Uninit3D(wined3d_device, destroy_surface, destroy_swapchain); + IWineD3DDevice_Release(wined3d_device); + if (FAILED(hr)) + { + ERR("Uninit3D failed, hr %#x\n", hr); + } + } + HeapFree(GetProcessHeap(), 0, This); } diff --git a/include/wine/winedxgi.idl b/include/wine/winedxgi.idl index 3fc7883..e54ce73 100644 --- a/include/wine/winedxgi.idl +++ b/include/wine/winedxgi.idl @@ -53,4 +53,8 @@ interface IWineDXGIDevice : IDXGIDevice [in] IUnknown *outer, [out] void **surface ); + HRESULT create_swapchain( + [in] struct _WINED3DPRESENT_PARAMETERS *present_parameters, + [out] struct IWineD3DSwapChain **wined3d_swapchain + ); }

1 0

Henri Verbeet : dxgi: Implement IDXGISwapChain::GetBuffer().
by Alexandre Julliard Feb. 24, 2009

Feb. 24, 2009

Module: wine Branch: master Commit: f4879dcec1f3f8db997516cf1b95e7bed909a402 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4879dcec1f3f8db997516cf1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 24 07:43:02 2009 +0100 dxgi: Implement IDXGISwapChain::GetBuffer(). --- dlls/dxgi/swapchain.c | 29 +++++++++++++++++++++++++++-- 1 files changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 3e9e444..af8bb0a 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -164,10 +164,35 @@ static HRESULT STDMETHODCALLTYPE dxgi_swapchain_Present(IDXGISwapChain *iface, U static HRESULT STDMETHODCALLTYPE dxgi_swapchain_GetBuffer(IDXGISwapChain *iface, UINT buffer_idx, REFIID riid, void **surface) { - FIXME("iface %p, buffer_idx %u, riid %s, surface %p stub!\n", + struct dxgi_swapchain *This = (struct dxgi_swapchain *)iface; + IWineD3DSurface *backbuffer; + IUnknown *parent; + HRESULT hr; + + TRACE("iface %p, buffer_idx %u, riid %s, surface %p\n", iface, buffer_idx, debugstr_guid(riid), surface); - return E_NOTIMPL; + EnterCriticalSection(&dxgi_cs); + + hr = IWineD3DSwapChain_GetBackBuffer(This->wined3d_swapchain, buffer_idx, WINED3DBACKBUFFER_TYPE_MONO, &backbuffer); + if (FAILED(hr)) + { + LeaveCriticalSection(&dxgi_cs); + return hr; + } + + hr = IWineD3DSurface_GetParent(backbuffer, &parent); + IWineD3DSurface_Release(backbuffer); + LeaveCriticalSection(&dxgi_cs); + if (FAILED(hr)) + { + return hr; + } + + hr = IUnknown_QueryInterface(parent, riid, surface); + IUnknown_Release(parent); + + return hr; } static HRESULT STDMETHODCALLTYPE dxgi_swapchain_SetFullscreenState(IDXGISwapChain *iface,

1 0

Alexandre Julliard : winhlp32: Fix a crash when started without arguments.
by Alexandre Julliard Feb. 24, 2009

Feb. 24, 2009

Module: wine Branch: master Commit: 1cd730b28929f942daa94aa67d081f82dda861b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cd730b28929f942daa94aa67… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 24 15:07:20 2009 +0100 winhlp32: Fix a crash when started without arguments. --- programs/winhlp32/winhelp.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/programs/winhlp32/winhelp.c b/programs/winhlp32/winhelp.c index 7a9e093..02529ee 100644 --- a/programs/winhlp32/winhelp.c +++ b/programs/winhlp32/winhelp.c @@ -274,9 +274,7 @@ HLPFILE_WINDOWINFO* WINHELP_GetWindowInfo(HLPFILE* hlpfile, LPCSTR name) { strcpy(mwi.type, "primary"); strcpy(mwi.name, "main"); - if (hlpfile && !LoadString(Globals.hInstance, STID_WINE_HELP, - mwi.caption, sizeof(mwi.caption))) - strcpy(mwi.caption, hlpfile->lpszTitle); + LoadString(Globals.hInstance, STID_WINE_HELP, mwi.caption, sizeof(mwi.caption)); mwi.origin.x = mwi.origin.y = mwi.size.cx = mwi.size.cy = CW_USEDEFAULT; mwi.style = SW_SHOW; mwi.win_style = WS_OVERLAPPEDWINDOW;

1 0

Henri Verbeet : dxgi: Initial IDXGISwapChain::Present() implementation.
by Alexandre Julliard Feb. 24, 2009

Feb. 24, 2009

Module: wine Branch: master Commit: 964408d0bfe6d7098441f52d7464ce0ba7821a2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=964408d0bfe6d7098441f52d7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 24 07:43:02 2009 +0100 dxgi: Initial IDXGISwapChain::Present() implementation. --- dlls/dxgi/swapchain.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index af8bb0a..8b4fe75 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -156,9 +156,14 @@ static HRESULT STDMETHODCALLTYPE dxgi_swapchain_GetDevice(IDXGISwapChain *iface, static HRESULT STDMETHODCALLTYPE dxgi_swapchain_Present(IDXGISwapChain *iface, UINT sync_interval, UINT flags) { - FIXME("iface %p, sync_interval %u, flags %#x stub!\n", iface, sync_interval, flags); + struct dxgi_swapchain *This = (struct dxgi_swapchain *)iface; - return E_NOTIMPL; + TRACE("iface %p, sync_interval %u, flags %#x\n", iface, sync_interval, flags); + + if (sync_interval) FIXME("Unimplemented sync interval %u\n", sync_interval); + if (flags) FIXME("Unimplemented flags %#x\n", flags); + + return IWineD3DSwapChain_Present(This->wined3d_swapchain, NULL, NULL, NULL, NULL, 0); } static HRESULT STDMETHODCALLTYPE dxgi_swapchain_GetBuffer(IDXGISwapChain *iface,

1 0

Henri Verbeet : d3d10core: Add a wined3d rendertarget view to the d3d10 rendertarget view.
by Alexandre Julliard Feb. 24, 2009

Feb. 24, 2009

Module: wine Branch: master Commit: 91e4ec57ccfbf0fdee79ac9e6d3194ab8ebb535e URL: http://source.winehq.org/git/wine.git/?a=commit;h=91e4ec57ccfbf0fdee79ac9e6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 24 07:43:02 2009 +0100 d3d10core: Add a wined3d rendertarget view to the d3d10 rendertarget view. --- dlls/d3d10core/d3d10core_private.h | 2 +- dlls/d3d10core/device.c | 33 +++++++++++++++++++++++++++++++-- dlls/d3d10core/view.c | 32 +++++++++++++++++++++++++++++--- 3 files changed, 61 insertions(+), 6 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index fd689b9..a05f773 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -85,7 +85,7 @@ struct d3d10_rendertarget_view const struct ID3D10RenderTargetViewVtbl *vtbl; LONG refcount; - ID3D10Resource *resource; + IWineD3DRendertargetView *wined3d_view; D3D10_RENDER_TARGET_VIEW_DESC desc; }; diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 7c39ce5..0eeb5d9 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -689,6 +689,26 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateShaderResourceView(ID3D10Dev return E_NOTIMPL; } +static IWineD3DResource *d3d10_device_wined3d_resource_from_resource(ID3D10Resource *resource) +{ + D3D10_RESOURCE_DIMENSION dimension; + + ID3D10Resource_GetType(resource, &dimension); + + switch(dimension) + { + case D3D10_RESOURCE_DIMENSION_BUFFER: + return (IWineD3DResource *)((struct d3d10_buffer *)resource)->wined3d_buffer; + + case D3D10_RESOURCE_DIMENSION_TEXTURE2D: + return (IWineD3DResource *)((struct d3d10_texture2d *)resource)->wined3d_surface; + + default: + FIXME("Unhandled resource dimension %#x\n", dimension); + return NULL; + } +} + static HRESULT d3d10_device_set_rtdesc_from_resource(D3D10_RENDER_TARGET_VIEW_DESC *desc, ID3D10Resource *resource) { D3D10_RESOURCE_DIMENSION dimension; @@ -811,7 +831,9 @@ static HRESULT d3d10_device_set_rtdesc_from_resource(D3D10_RENDER_TARGET_VIEW_DE static HRESULT STDMETHODCALLTYPE d3d10_device_CreateRenderTargetView(ID3D10Device *iface, ID3D10Resource *resource, const D3D10_RENDER_TARGET_VIEW_DESC *desc, ID3D10RenderTargetView **view) { + struct d3d10_device *This = (struct d3d10_device *)iface; struct d3d10_rendertarget_view *object; + IWineD3DResource *wined3d_resource; TRACE("iface %p, resource %p, desc %p, view %p stub!\n", iface, resource, desc, view); @@ -839,8 +861,15 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateRenderTargetView(ID3D10Devic object->desc = *desc; } - object->resource = resource; - ID3D10Resource_AddRef(resource); + wined3d_resource = d3d10_device_wined3d_resource_from_resource(resource); + if (!wined3d_resource) + { + FIXME("Failed to get wined3d resource for d3d10 resource %p\n", resource); + HeapFree(GetProcessHeap(), 0, object); + return E_FAIL; + } + IWineD3DDevice_CreateRendertargetView(This->wined3d_device, + wined3d_resource, (IUnknown *)object, &object->wined3d_view); *view = (ID3D10RenderTargetView *)object; diff --git a/dlls/d3d10core/view.c b/dlls/d3d10core/view.c index 59d56b6..4643661 100644 --- a/dlls/d3d10core/view.c +++ b/dlls/d3d10core/view.c @@ -66,7 +66,7 @@ static ULONG STDMETHODCALLTYPE d3d10_rendertarget_view_Release(ID3D10RenderTarge if (!refcount) { - ID3D10Resource_Release(This->resource); + IWineD3DRendertargetView_Release(This->wined3d_view); HeapFree(GetProcessHeap(), 0, This); } @@ -112,11 +112,37 @@ static void STDMETHODCALLTYPE d3d10_rendertarget_view_GetResource(ID3D10RenderTa ID3D10Resource **resource) { struct d3d10_rendertarget_view *This = (struct d3d10_rendertarget_view *)iface; + IWineD3DResource *wined3d_resource; + IUnknown *parent; + HRESULT hr; TRACE("iface %p, resource %p\n", iface, resource); - ID3D10Resource_AddRef(This->resource); - *resource = This->resource; + hr = IWineD3DRendertargetView_GetResource(This->wined3d_view, &wined3d_resource); + if (FAILED(hr)) + { + ERR("Failed to get wined3d resource, hr %#x\n", hr); + *resource = NULL; + return; + } + + hr = IWineD3DResource_GetParent(wined3d_resource, &parent); + IWineD3DResource_Release(wined3d_resource); + if (FAILED(hr)) + { + ERR("Failed to get wined3d resource parent, hr %#x\n", hr); + *resource = NULL; + return; + } + + hr = IUnknown_QueryInterface(parent, &IID_ID3D10Resource, (void **)&resource); + IUnknown_Release(parent); + if (FAILED(hr)) + { + ERR("Resource parent isn't a d3d10 resource, hr %#x\n", hr); + *resource = NULL; + return; + } } /* ID3D10RenderTargetView methods */

1 0

Henri Verbeet : wined3d: Add IWineD3DRendertargetView.
by Alexandre Julliard Feb. 24, 2009

Feb. 24, 2009

Module: wine Branch: master Commit: c796f7648391cf94a351c6bb28e3b1d1bf4c8f5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c796f7648391cf94a351c6bb2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 24 07:43:02 2009 +0100 wined3d: Add IWineD3DRendertargetView. --- dlls/wined3d/Makefile.in | 1 + dlls/wined3d/device.c | 24 +++++++++ dlls/wined3d/view.c | 110 ++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 12 ++++ include/wine/wined3d.idl | 17 ++++++ 5 files changed, 164 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/Makefile.in b/dlls/wined3d/Makefile.in index 03826c8..5eaa1bf 100644 --- a/dlls/wined3d/Makefile.in +++ b/dlls/wined3d/Makefile.in @@ -37,6 +37,7 @@ C_SRCS = \ utils.c \ vertexdeclaration.c \ vertexshader.c \ + view.c \ volume.c \ volumetexture.c \ wined3d_main.c diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 6be6746..2196894 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -793,6 +793,29 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateSurface(IWineD3DDevice *iface, U return hr; } +static HRESULT WINAPI IWineD3DDeviceImpl_CreateRendertargetView(IWineD3DDevice *iface, + IWineD3DResource *resource, IUnknown *parent, IWineD3DRendertargetView **rendertarget_view) +{ + struct wined3d_rendertarget_view *object; + + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); + if (!object) + { + ERR("Failed to allocate memory\n"); + return E_OUTOFMEMORY; + } + + object->vtbl = &wined3d_rendertarget_view_vtbl; + object->refcount = 1; + IWineD3DResource_AddRef(resource); + object->resource = resource; + object->parent = parent; + + *rendertarget_view = (IWineD3DRendertargetView *)object; + + return WINED3D_OK; +} + static HRESULT WINAPI IWineD3DDeviceImpl_CreateTexture(IWineD3DDevice *iface, UINT Width, UINT Height, UINT Levels, DWORD Usage, WINED3DFORMAT Format, WINED3DPOOL Pool, IWineD3DTexture **ppTexture, HANDLE *pSharedHandle, IUnknown *parent) @@ -7575,6 +7598,7 @@ const IWineD3DDeviceVtbl IWineD3DDevice_Vtbl = IWineD3DDeviceImpl_CreateIndexBuffer, IWineD3DDeviceImpl_CreateStateBlock, IWineD3DDeviceImpl_CreateSurface, + IWineD3DDeviceImpl_CreateRendertargetView, IWineD3DDeviceImpl_CreateTexture, IWineD3DDeviceImpl_CreateVolumeTexture, IWineD3DDeviceImpl_CreateVolume, diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c new file mode 100644 index 0000000..bbf0f5f --- /dev/null +++ b/dlls/wined3d/view.c @@ -0,0 +1,110 @@ +/* + * Copyright 2009 Henri Verbeet for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#include "config.h" +#include "wine/port.h" + +#include "wined3d_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(d3d); + +/* IUnknown methods */ + +static HRESULT STDMETHODCALLTYPE rendertarget_view_QueryInterface(IWineD3DRendertargetView *iface, + REFIID riid, void **object) +{ + TRACE("iface %p, riid %s, object %p\n", iface, debugstr_guid(riid), object); + + if (IsEqualGUID(riid, &IID_IWineD3DRendertargetView) + || IsEqualGUID(riid, &IID_IWineD3DBase) + || IsEqualGUID(riid, &IID_IUnknown)) + { + IUnknown_AddRef(iface); + *object = iface; + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE\n", debugstr_guid(riid)); + + *object = NULL; + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE rendertarget_view_AddRef(IWineD3DRendertargetView *iface) +{ + struct wined3d_rendertarget_view *This = (struct wined3d_rendertarget_view *)iface; + ULONG refcount = InterlockedIncrement(&This->refcount); + + TRACE("%p increasing refcount to %u\n", This, refcount); + + return refcount; +} + +static ULONG STDMETHODCALLTYPE rendertarget_view_Release(IWineD3DRendertargetView *iface) +{ + struct wined3d_rendertarget_view *This = (struct wined3d_rendertarget_view *)iface; + ULONG refcount = InterlockedDecrement(&This->refcount); + + TRACE("%p decreasing refcount to %u\n", This, refcount); + + if (!refcount) + { + IWineD3DResource_Release(This->resource); + HeapFree(GetProcessHeap(), 0, This); + } + + return refcount; +} + +/* IWineD3DBase methods */ + +static HRESULT STDMETHODCALLTYPE rendertarget_view_GetParent(IWineD3DRendertargetView *iface, IUnknown **parent) +{ + struct wined3d_rendertarget_view *This = (struct wined3d_rendertarget_view *)iface; + + IUnknown_AddRef(This->parent); + *parent = This->parent; + + return WINED3D_OK; +} + +/* IWineD3DRendertargetView methods */ + +static HRESULT STDMETHODCALLTYPE rendertarget_view_GetResource(IWineD3DRendertargetView *iface, + IWineD3DResource **resource) +{ + struct wined3d_rendertarget_view *This = (struct wined3d_rendertarget_view *)iface; + + IWineD3DResource_AddRef(This->resource); + *resource = This->resource; + + return WINED3D_OK; +} + +const struct IWineD3DRendertargetViewVtbl wined3d_rendertarget_view_vtbl = +{ + /* IUnknown methods */ + rendertarget_view_QueryInterface, + rendertarget_view_AddRef, + rendertarget_view_Release, + /* IWineD3DBase methods */ + rendertarget_view_GetParent, + /* IWineD3DRendertargetView methods */ + rendertarget_view_GetResource, +}; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8a88cf1..4c895b1 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1985,6 +1985,18 @@ struct wined3d_buffer extern const IWineD3DBufferVtbl wined3d_buffer_vtbl; +/* IWineD3DRendertargetView */ +struct wined3d_rendertarget_view +{ + const struct IWineD3DRendertargetViewVtbl *vtbl; + LONG refcount; + + IWineD3DResource *resource; + IUnknown *parent; +}; + +extern const IWineD3DRendertargetViewVtbl wined3d_rendertarget_view_vtbl; + /***************************************************************************** * IWineD3DSwapChainImpl implementation structure (extends IUnknown) */ diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index dc376d0..70e73b5 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -2396,6 +2396,18 @@ interface IWineD3DResource : IWineD3DBase [ object, local, + uuid(f7d8abf4-fb93-43e4-9c96-4618cf9b3cbc) +] +interface IWineD3DRendertargetView : IWineD3DBase +{ + HRESULT GetResource( + [out] IWineD3DResource **resource + ); +} + +[ + object, + local, uuid(217f671e-6f30-11d9-c687-00046142c14f) ] interface IWineD3DVertexBuffer : IWineD3DResource @@ -3012,6 +3024,11 @@ interface IWineD3DDevice : IWineD3DBase [in] WINED3DSURFTYPE surface_type, [in] IUnknown *parent ); + HRESULT CreateRendertargetView( + [in] IWineD3DResource *resource, + [in] IUnknown *parent, + [out] IWineD3DRendertargetView **rendertarget_view + ); HRESULT CreateTexture( [in] UINT width, [in] UINT height,

1 0

Jeremy White : sane.ds: Implement support for ICAP_XRESOLUTION and ICAP_YRESOLUTION.
by Alexandre Julliard Feb. 24, 2009

Feb. 24, 2009

Module: wine Branch: master Commit: 6ace799f5ac16d431d29de8ec0362951932dcf0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ace799f5ac16d431d29de8ec… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Mon Feb 23 16:25:26 2009 -0600 sane.ds: Implement support for ICAP_XRESOLUTION and ICAP_YRESOLUTION. --- dlls/sane.ds/capability.c | 141 ++++++++++++++++++++++++++++++++++++++++++++- dlls/sane.ds/ds_ctrl.c | 8 ++- dlls/sane.ds/options.c | 57 +++++++++++++++++- dlls/sane.ds/sane_i.h | 8 +++ dlls/twain_32/tests/dsm.c | 129 ++++++++++++++++++++++++++++++++++++++++- 5 files changed, 336 insertions(+), 7 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6ace799f5ac16d431d29d…

1 0

Alexandre Julliard : user32/tests: Skip more input tests if we can' t queue keyboard input.
by Alexandre Julliard Feb. 24, 2009

Feb. 24, 2009

Module: wine Branch: master Commit: 5771166aa78e8822dacb75bcdceca90ae5d839eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=5771166aa78e8822dacb75bcd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 24 14:57:51 2009 +0100 user32/tests: Skip more input tests if we can't queue keyboard input. Fix some tests on Win9x. --- dlls/user32/tests/input.c | 27 +++++++++++++++++++-------- 1 files changed, 19 insertions(+), 8 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 0d58189..889244f 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -236,11 +236,11 @@ static BOOL do_test( HWND hwnd, int seqnr, const KEV td[] ) MSGNAME[msg.message - WM_KEYFIRST], msg.wParam, msg.lParam, msg.time); if( i < kmctr ) { ok( msg.message == expmsg[i].message && - msg.wParam == expmsg[i].wParam && - msg.lParam == expmsg[i].lParam, - "%u/%u: wrong message %x expected %s wParam %04lx lParam %08lx\n", - seqnr, i, msg.message, MSGNAME[(expmsg[i]).message - WM_KEYFIRST], - expmsg[i].wParam, expmsg[i].lParam ); + msg.wParam == expmsg[i].wParam && + msg.lParam == expmsg[i].lParam, + "%u/%u: wrong message %x/%08lx/%08lx expected %s/%08lx/%08lx\n", + seqnr, i, msg.message, msg.wParam, msg.lParam, + MSGNAME[(expmsg[i]).message - WM_KEYFIRST], expmsg[i].wParam, expmsg[i].lParam ); } i++; } @@ -578,6 +578,7 @@ struct sendinput_test_s { {{VK_MENU, 0x80}, {VK_LMENU, 0x80}, {VK_CONTROL, 0x81, 1}, {VK_LCONTROL, 0x80, 1}, {0}}, {{WM_KEYUP, hook|wparam|optional, VK_LCONTROL}, {WM_KEYUP, hook|wparam, VK_RMENU}, + {WM_SYSKEYUP, wparam|lparam|optional, VK_CONTROL, KF_UP}, {WM_SYSKEYUP, wparam|lparam, VK_MENU, KF_UP}, {WM_SYSCOMMAND}, {0}}}, /* LMENU | KEYEVENTF_EXTENDEDKEY == RMENU */ @@ -602,6 +603,7 @@ struct sendinput_test_s { {{VK_MENU, 0x80}, {VK_RMENU, 0x80}, {VK_CONTROL, 0x81, 1}, {VK_LCONTROL, 0x80, 1}, {0}}, {{WM_KEYUP, hook|wparam|lparam|optional, VK_LCONTROL, LLKHF_UP}, {WM_KEYUP, hook|wparam|lparam, VK_RMENU, LLKHF_UP|LLKHF_EXTENDED}, + {WM_SYSKEYUP, wparam|lparam|optional, VK_CONTROL, KF_UP}, {WM_SYSKEYUP, wparam|lparam, VK_MENU, KF_UP|KF_EXTENDED}, {WM_SYSCOMMAND}, {0}}}, /* MENU == LMENU */ @@ -800,6 +802,7 @@ static LRESULT CALLBACK WndProc2(HWND hWnd, UINT Msg, WPARAM wParam, Msg != WM_NCHITTEST && Msg != WM_GETTEXT && Msg != WM_GETICON && + Msg != WM_IME_SELECT && Msg != WM_DEVICECHANGE) { ok(sent_messages_cnt < MAXKEYMESSAGES, "Too many messages\n"); @@ -882,6 +885,11 @@ static void test_Input_blackbox(void) pSendInput(1, (INPUT*)&i, sizeof(TEST_INPUT)); empty_message_queue(); GetKeyboardState(ks2); + if (!ii && !sent_messages_cnt && !memcmp( ks1, ks2, sizeof(ks1) )) + { + win_skip( "window doesn't receive the queued input\n" ); + break; + } compare_and_check(ii, ks1, ks2, &sendinput_test[ii]); } @@ -1180,7 +1188,8 @@ static void test_key_map(void) s = MapVirtualKeyEx(VK_SHIFT, MAPVK_VK_TO_VSC, kl); ok(s != 0, "MapVirtualKeyEx(VK_SHIFT) should return non-zero\n"); sL = MapVirtualKeyEx(VK_LSHIFT, MAPVK_VK_TO_VSC, kl); - ok(s == sL, "%x != %x\n", s, sL); + ok(s == sL || broken(sL == 0), /* win9x */ + "%x != %x\n", s, sL); kL = MapVirtualKeyEx(0x2a, MAPVK_VSC_TO_VK, kl); ok(kL == VK_SHIFT, "Scan code -> vKey = %x (not VK_SHIFT)\n", kL); @@ -1188,9 +1197,11 @@ static void test_key_map(void) ok(kR == VK_SHIFT, "Scan code -> vKey = %x (not VK_SHIFT)\n", kR); kL = MapVirtualKeyEx(0x2a, MAPVK_VSC_TO_VK_EX, kl); - ok(kL == VK_LSHIFT, "Scan code -> vKey = %x (not VK_LSHIFT)\n", kL); + ok(kL == VK_LSHIFT || broken(kL == 0), /* win9x */ + "Scan code -> vKey = %x (not VK_LSHIFT)\n", kL); kR = MapVirtualKeyEx(0x36, MAPVK_VSC_TO_VK_EX, kl); - ok(kR == VK_RSHIFT, "Scan code -> vKey = %x (not VK_RSHIFT)\n", kR); + ok(kR == VK_RSHIFT || broken(kR == 0), /* win9x */ + "Scan code -> vKey = %x (not VK_RSHIFT)\n", kR); /* test that MAPVK_VSC_TO_VK prefers the non-numpad vkey if there's ambiguity */ for (i = 0; i < sizeof(numpad_collisions)/sizeof(numpad_collisions[0]); i++)

1 0

Alexandre Julliard : user32/tests: Add a couple of optional messages.
by Alexandre Julliard Feb. 24, 2009

Feb. 24, 2009

Module: wine Branch: master Commit: f728c19a73c2c6ab238f4ce06364bf0e439f7813 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f728c19a73c2c6ab238f4ce06… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 24 14:58:02 2009 +0100 user32/tests: Add a couple of optional messages. --- dlls/user32/tests/msg.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index aa32eed..4a6778f 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -182,6 +182,7 @@ static const struct message WmSWP_ShowOverlappedSeq[] = { { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, { WM_PAINT, sent|optional }, { WM_NCPAINT, sent|beginpaint|optional }, + { WM_GETTEXT, sent|defwinproc|optional }, { WM_ERASEBKGND, sent|beginpaint|optional }, { 0 } }; @@ -2131,7 +2132,7 @@ static const struct message WmCreateMDIframeSeq[] = { { WM_QUERYNEWPALETTE, sent|wparam|lparam|optional, 0, 0 }, { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, /* XP */ { WM_ACTIVATEAPP, sent|wparam|optional, 1 }, /* Win9x doesn't send it */ - { WM_NCACTIVATE, sent|wparam, 1 }, + { WM_NCACTIVATE, sent }, { WM_GETTEXT, sent|defwinproc|optional }, { WM_ACTIVATE, sent|wparam, 1 }, { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, /* Win9x */ @@ -10031,6 +10032,10 @@ static const struct message WmMinMax_2[] = { static const struct message WmMinMax_3[] = { { HCBT_MINMAX, hook|lparam, 0, SW_MINIMIZE }, { HCBT_SETFOCUS, hook|optional }, + { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_SHOWWINDOW|SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, + { WM_WINDOWPOSCHANGED, sent|wparam|optional, SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, + { WM_MOVE, sent|defwinproc|optional }, + { WM_SIZE, sent|wparam|defwinproc|optional, SIZE_RESTORED }, { 0 } }; static const struct message WmMinMax_4[] = {

1 0

Jacek Caban : shdocvw: Added QueryStatus implementation.
by Alexandre Julliard Feb. 24, 2009

Feb. 24, 2009

Module: wine Branch: master Commit: 64adaf723bdffabedef62d7f166df6675e1988b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64adaf723bdffabedef62d7f1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 23 15:38:30 2009 +0100 shdocvw: Added QueryStatus implementation. --- dlls/shdocvw/oleobject.c | 21 +++++++++++++++++++-- dlls/shdocvw/tests/webbrowser.c | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 2 deletions(-) diff --git a/dlls/shdocvw/oleobject.c b/dlls/shdocvw/oleobject.c index 9b7168f..aab06d0 100644 --- a/dlls/shdocvw/oleobject.c +++ b/dlls/shdocvw/oleobject.c @@ -868,9 +868,26 @@ static HRESULT WINAPI WBOleCommandTarget_QueryStatus(IOleCommandTarget *iface, const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds[], OLECMDTEXT *pCmdText) { WebBrowser *This = OLECMD_THIS(iface); - FIXME("(%p)->(%s %u %p %p)\n", This, debugstr_guid(pguidCmdGroup), cCmds, prgCmds, + IOleCommandTarget *cmdtrg; + HRESULT hres; + + TRACE("(%p)->(%s %u %p %p)\n", This, debugstr_guid(pguidCmdGroup), cCmds, prgCmds, pCmdText); - return E_NOTIMPL; + + if(!This->doc_host.document) + return 0x80040104; + + /* NOTE: There are probably some commands that we should handle here + * instead of forwarding to document object. */ + + hres = IUnknown_QueryInterface(This->doc_host.document, &IID_IOleCommandTarget, (void**)&cmdtrg); + if(FAILED(hres)) + return hres; + + hres = IOleCommandTarget_QueryStatus(cmdtrg, pguidCmdGroup, cCmds, prgCmds, pCmdText); + IOleCommandTarget_Release(cmdtrg); + + return hres; } static HRESULT WINAPI WBOleCommandTarget_Exec(IOleCommandTarget *iface, diff --git a/dlls/shdocvw/tests/webbrowser.c b/dlls/shdocvw/tests/webbrowser.c index f699e90..2f1c7d7 100644 --- a/dlls/shdocvw/tests/webbrowser.c +++ b/dlls/shdocvw/tests/webbrowser.c @@ -30,6 +30,7 @@ #include "exdisp.h" #include "htiframe.h" #include "mshtmhst.h" +#include "mshtmcid.h" #include "idispids.h" #include "olectl.h" #include "mshtmdid.h" @@ -2123,6 +2124,36 @@ static void test_download(void) CHECK_CALLED(Invoke_DOCUMENTCOMPLETE); } +static void test_olecmd(IUnknown *unk, BOOL loaded) +{ + IOleCommandTarget *cmdtrg; + OLECMD cmds[3]; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IOleCommandTarget, (void**)&cmdtrg); + ok(hres == S_OK, "Could not get IOleCommandTarget iface: %08x\n", hres); + if(FAILED(hres)) + return; + + cmds[0].cmdID = OLECMDID_SPELL; + cmds[0].cmdf = 0xdeadbeef; + cmds[1].cmdID = OLECMDID_REFRESH; + cmds[1].cmdf = 0xdeadbeef; + hres = IOleCommandTarget_QueryStatus(cmdtrg, NULL, 2, cmds, NULL); + if(loaded) { + ok(hres == S_OK, "QueryStatus failed: %08x\n", hres); + ok(cmds[0].cmdf == OLECMDF_SUPPORTED, "OLECMDID_SPELL cmdf = %x\n", cmds[0].cmdf); + ok(cmds[1].cmdf == (OLECMDF_ENABLED|OLECMDF_SUPPORTED), + "OLECMDID_REFRESH cmdf = %x\n", cmds[1].cmdf); + }else { + ok(hres == 0x80040104, "QueryStatus failed: %08x\n", hres); + ok(cmds[0].cmdf == 0xdeadbeef, "OLECMDID_SPELL cmdf = %x\n", cmds[0].cmdf); + ok(cmds[1].cmdf == 0xdeadbeef, "OLECMDID_REFRESH cmdf = %x\n", cmds[0].cmdf); + } + + IOleCommandTarget_Release(cmdtrg); +} + static void test_IServiceProvider(IUnknown *unk) { IServiceProvider *servprov = (void*)0xdeadbeef; @@ -2213,10 +2244,12 @@ static void test_WebBrowser(BOOL do_download) test_Extent(unk); test_wb_funcs(unk, TRUE); test_DoVerb(unk); + test_olecmd(unk, FALSE); test_Navigate2(unk); if(do_download) { test_download(); + test_olecmd(unk, TRUE); } test_ClientSite(unk, NULL);

1 0