December 2009 - Wine-commits

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

07 Dec '09

Module: wine Branch: master Commit: bf1255e2cdda424a70b0db2be0060665cb908451 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf1255e2cdda424a70b0db2be… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 7 11:08:40 2009 +0100 dxgi: Implement IDXGISurface::GetParent(). --- dlls/dxgi/surface.c | 6 ++++-- dlls/dxgi/tests/device.c | 17 +++++++++++++++++ 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/surface.c b/dlls/dxgi/surface.c index 0d9aef1..6296c1a 100644 --- a/dlls/dxgi/surface.c +++ b/dlls/dxgi/surface.c @@ -130,9 +130,11 @@ static HRESULT STDMETHODCALLTYPE dxgi_surface_GetPrivateData(IDXGISurface *iface static HRESULT STDMETHODCALLTYPE dxgi_surface_GetParent(IDXGISurface *iface, REFIID riid, void **parent) { - FIXME("iface %p, riid %s, parent %p stub!\n", iface, debugstr_guid(riid), parent); + struct dxgi_surface *This = (struct dxgi_surface *)iface; - return E_NOTIMPL; + TRACE("iface %p, riid %s, parent %p.\n", iface, debugstr_guid(riid), parent); + + return IDXGIDevice_QueryInterface(This->device, riid, parent); } /* IDXGIDeviceSubObject methods */ diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index 32e87e6..2391c1b 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -153,12 +153,29 @@ static void test_create_surface(IDXGIDevice *device) static void test_parents(IDXGIDevice *device) { + DXGI_SURFACE_DESC surface_desc; + IDXGISurface *surface; IDXGIFactory *factory; IDXGIAdapter *adapter; IDXGIOutput *output; IUnknown *parent; HRESULT hr; + surface_desc.Width = 512; + surface_desc.Height = 512; + surface_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + surface_desc.SampleDesc.Count = 1; + surface_desc.SampleDesc.Quality = 0; + + hr = IDXGIDevice_CreateSurface(device, &surface_desc, 1, DXGI_USAGE_RENDER_TARGET_OUTPUT, NULL, &surface); + ok(SUCCEEDED(hr), "Failed to create a dxgi surface, hr %#x\n", hr); + + hr = IDXGISurface_GetParent(surface, &IID_IDXGIDevice, (void **)&parent); + IDXGISurface_Release(surface); + ok(SUCCEEDED(hr), "GetParent failed, hr %#x.\n", hr); + ok(parent == (IUnknown *)device, "Got parent %p, expected %p.\n", parent, device); + IUnknown_Release(parent); + hr = IDXGIDevice_GetAdapter(device, &adapter); ok(SUCCEEDED(hr), "GetAdapter failed, hr %#x.\n", hr);

1 0

Nikolay Sivov : windowscodecs/tests: Release decoder after use.
by Alexandre Julliard 07 Dec '09

07 Dec '09

Module: wine Branch: master Commit: fc7d6b39be9c9975bc0aafb864780d3779f2f15b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc7d6b39be9c9975bc0aafb86… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon Dec 7 13:42:37 2009 +0300 windowscodecs/tests: Release decoder after use. --- dlls/windowscodecs/tests/bmpformat.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/tests/bmpformat.c b/dlls/windowscodecs/tests/bmpformat.c index cf5a6f8..f817df5 100644 --- a/dlls/windowscodecs/tests/bmpformat.c +++ b/dlls/windowscodecs/tests/bmpformat.c @@ -225,6 +225,8 @@ static void test_decode_24bpp(void) /* cannot querycapability twice */ hr = IWICBitmapDecoder_QueryCapability(decoder2, bmpstream, &capability); ok(hr == WINCODEC_ERR_WRONGSTATE, "expected WINCODEC_ERR_WRONGSTATE, hr=%x\n", hr); + + IWICBitmapDecoder_Release(decoder2); } IStream_Release(bmpstream); @@ -373,6 +375,7 @@ static void test_decode_1bpp(void) ok(hr == S_OK, "QueryCapability failed, hr=%x\n", hr); ok(capability == (WICBitmapDecoderCapabilityCanDecodeAllImages), "unexpected capabilities: %x\n", capability); + IWICBitmapDecoder_Release(decoder2); } IStream_Release(bmpstream); @@ -531,6 +534,7 @@ static void test_decode_4bpp(void) ok(hr == S_OK, "QueryCapability failed, hr=%x\n", hr); ok(capability == (WICBitmapDecoderCapabilityCanDecodeAllImages), "unexpected capabilities: %x\n", capability); + IWICBitmapDecoder_Release(decoder2); } IStream_Release(bmpstream); @@ -710,6 +714,7 @@ static void test_decode_rle8(void) ok(hr == S_OK, "QueryCapability failed, hr=%x\n", hr); ok(capability == (WICBitmapDecoderCapabilityCanDecodeAllImages), "unexpected capabilities: %x\n", capability); + IWICBitmapDecoder_Release(decoder2); } IStream_Release(bmpstream); @@ -876,6 +881,7 @@ static void test_decode_rle4(void) ok(hr == S_OK, "QueryCapability failed, hr=%x\n", hr); ok(capability == (WICBitmapDecoderCapabilityCanDecodeAllImages), "unexpected capabilities: %x\n", capability); + IWICBitmapDecoder_Release(decoder2); } IStream_Release(bmpstream);

1 0

Huw Davies : xinput1_3: Don't print the contents of [out] parameters.
by Alexandre Julliard 07 Dec '09

07 Dec '09

Module: wine Branch: master Commit: 7c1deca74c35c52fe54c344fbebd347249caf03c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c1deca74c35c52fe54c344fb… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Dec 7 11:33:02 2009 +0000 xinput1_3: Don't print the contents of [out] parameters. Found by Valgrind. --- dlls/xinput1_3/xinput1_3_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/xinput1_3/xinput1_3_main.c b/dlls/xinput1_3/xinput1_3_main.c index f4386b8..fc55cef 100644 --- a/dlls/xinput1_3/xinput1_3_main.c +++ b/dlls/xinput1_3/xinput1_3_main.c @@ -105,7 +105,7 @@ DWORD WINAPI XInputGetCapabilities(DWORD dwUserIndex, DWORD dwFlags, XINPUT_CAPA DWORD WINAPI XInputGetDSoundAudioDeviceGuids(DWORD dwUserIndex, GUID* pDSoundRenderGuid, GUID* pDSoundCaptureGuid) { - FIXME("(%d %s %s) Stub!\n", dwUserIndex, debugstr_guid(pDSoundRenderGuid), debugstr_guid(pDSoundCaptureGuid)); + FIXME("(%d %p %p) Stub!\n", dwUserIndex, pDSoundRenderGuid, pDSoundCaptureGuid); if (dwUserIndex < XUSER_MAX_COUNT) {

1 0

Maarten Lankhorst : dsound: Move buffer property sets to buffer.c.
by Alexandre Julliard 07 Dec '09

07 Dec '09

Module: wine Branch: master Commit: 7326586517e07604f23d59ebd9e4cf2701e10f11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7326586517e07604f23d59ebd… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Dec 4 14:09:32 2009 +0100 dsound: Move buffer property sets to buffer.c. --- dlls/dsound/buffer.c | 187 +++++++++++++++++++++++++++++++++++++++++++++++++ dlls/dsound/propset.c | 185 ------------------------------------------------ 2 files changed, 187 insertions(+), 185 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7326586517e07604f23d5…

1 0

Paul Chitescu : advapi32: Reduce registry access to MAXIMUM_ALLOWED wherever possible.
by Alexandre Julliard 07 Dec '09

07 Dec '09

Module: wine Branch: master Commit: 7fea0e332fb7b3aa532f3534c89c2620b3706ad2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fea0e332fb7b3aa532f3534c… Author: Paul Chitescu <paulc(a)voip.null.ro> Date: Fri Dec 4 17:07:27 2009 +0200 advapi32: Reduce registry access to MAXIMUM_ALLOWED wherever possible. --- dlls/advapi32/registry.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 3762908..28eabe3 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -137,7 +137,7 @@ static inline HKEY get_special_root_hkey( HKEY hkey ) if ((hkey >= HKEY_SPECIAL_ROOT_FIRST) && (hkey <= HKEY_SPECIAL_ROOT_LAST)) { if (!(ret = special_root_keys[(UINT_PTR)hkey - (UINT_PTR)HKEY_SPECIAL_ROOT_FIRST])) - ret = create_special_root_hkey( hkey, KEY_ALL_ACCESS ); + ret = create_special_root_hkey( hkey, MAXIMUM_ALLOWED ); } return ret; } @@ -233,7 +233,7 @@ LSTATUS WINAPI RegCreateKeyExA( HKEY hkey, LPCSTR name, DWORD reserved, LPSTR cl if (reserved) return ERROR_INVALID_PARAMETER; if (!is_version_nt()) { - access = KEY_ALL_ACCESS; /* Win95 ignores the access mask */ + access = MAXIMUM_ALLOWED; /* Win95 ignores the access mask */ if (name && *name == '\\') name++; /* win9x,ME ignores one (and only one) beginning backslash */ } if (!(hkey = get_special_root_hkey( hkey ))) return ERROR_INVALID_HANDLE; @@ -279,7 +279,7 @@ LSTATUS WINAPI RegCreateKeyW( HKEY hkey, LPCWSTR lpSubKey, PHKEY phkResult ) /* FIXME: previous implementation converted ERROR_INVALID_HANDLE to ERROR_BADKEY, */ /* but at least my version of NT (4.0 SP5) doesn't do this. -- AJ */ return RegCreateKeyExW( hkey, lpSubKey, 0, NULL, REG_OPTION_NON_VOLATILE, - KEY_ALL_ACCESS, NULL, phkResult, NULL ); + MAXIMUM_ALLOWED, NULL, phkResult, NULL ); } @@ -291,7 +291,7 @@ LSTATUS WINAPI RegCreateKeyW( HKEY hkey, LPCWSTR lpSubKey, PHKEY phkResult ) LSTATUS WINAPI RegCreateKeyA( HKEY hkey, LPCSTR lpSubKey, PHKEY phkResult ) { return RegCreateKeyExA( hkey, lpSubKey, 0, NULL, REG_OPTION_NON_VOLATILE, - KEY_ALL_ACCESS, NULL, phkResult, NULL ); + MAXIMUM_ALLOWED, NULL, phkResult, NULL ); } @@ -348,7 +348,7 @@ LSTATUS WINAPI RegOpenKeyExA( HKEY hkey, LPCSTR name, DWORD reserved, REGSAM acc STRING nameA; NTSTATUS status; - if (!is_version_nt()) access = KEY_ALL_ACCESS; /* Win95 ignores the access mask */ + if (!is_version_nt()) access = MAXIMUM_ALLOWED; /* Win95 ignores the access mask */ else { /* NT+ allows beginning backslash for HKEY_CLASSES_ROOT */ @@ -389,7 +389,7 @@ LSTATUS WINAPI RegOpenKeyW( HKEY hkey, LPCWSTR name, PHKEY retkey ) *retkey = hkey; return ERROR_SUCCESS; } - return RegOpenKeyExW( hkey, name, 0, KEY_ALL_ACCESS, retkey ); + return RegOpenKeyExW( hkey, name, 0, MAXIMUM_ALLOWED, retkey ); } @@ -417,7 +417,7 @@ LSTATUS WINAPI RegOpenKeyA( HKEY hkey, LPCSTR name, PHKEY retkey ) *retkey = hkey; return ERROR_SUCCESS; } - return RegOpenKeyExA( hkey, name, 0, KEY_ALL_ACCESS, retkey ); + return RegOpenKeyExA( hkey, name, 0, MAXIMUM_ALLOWED, retkey ); }

1 0

Paul Chitescu : services.exe: Reduce Registry access to KEY_READ or MAXIMUM_ALLOWED wherever possible.
by Alexandre Julliard 07 Dec '09

07 Dec '09

Module: wine Branch: master Commit: 910b191574f5dbcb844e6f9352ce66547075164b URL: http://source.winehq.org/git/wine.git/?a=commit;h=910b191574f5dbcb844e6f935… Author: Paul Chitescu <paulc(a)voip.null.ro> Date: Fri Dec 4 17:58:20 2009 +0200 services.exe: Reduce Registry access to KEY_READ or MAXIMUM_ALLOWED wherever possible. --- programs/services/rpc.c | 39 ++++++++++++++++++++++++--------------- programs/services/services.c | 4 ++-- 2 files changed, 26 insertions(+), 17 deletions(-) diff --git a/programs/services/rpc.c b/programs/services/rpc.c index 6327c9a..c647cc8 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -84,6 +84,21 @@ struct sc_lock struct scmdatabase *db; }; +static void free_config_strings(QUERY_SERVICE_CONFIGW *old_cfg, QUERY_SERVICE_CONFIGW *new_cfg) +{ + if (old_cfg->lpBinaryPathName != new_cfg->lpBinaryPathName) + HeapFree(GetProcessHeap(), 0, old_cfg->lpBinaryPathName); + + if (old_cfg->lpLoadOrderGroup != new_cfg->lpLoadOrderGroup) + HeapFree(GetProcessHeap(), 0, old_cfg->lpLoadOrderGroup); + + if (old_cfg->lpServiceStartName != new_cfg->lpServiceStartName) + HeapFree(GetProcessHeap(), 0, old_cfg->lpServiceStartName); + + if (old_cfg->lpDisplayName != new_cfg->lpDisplayName) + HeapFree(GetProcessHeap(), 0, old_cfg->lpDisplayName); +} + /* Check if the given handle is of the required type and allows the requested access. */ static DWORD validate_context_handle(SC_RPC_HANDLE handle, DWORD type, DWORD needed_access, struct sc_handle **out_hdr) { @@ -546,34 +561,28 @@ DWORD svcctl_ChangeServiceConfigW( /* configuration OK. The strings needs to be duplicated */ if (lpBinaryPathName != NULL) - { - HeapFree(GetProcessHeap(), 0, service->service_entry->config.lpBinaryPathName); new_entry.config.lpBinaryPathName = strdupW(lpBinaryPathName); - } if (lpLoadOrderGroup != NULL) - { - HeapFree(GetProcessHeap(), 0, service->service_entry->config.lpLoadOrderGroup); new_entry.config.lpLoadOrderGroup = strdupW(lpLoadOrderGroup); - } if (lpServiceStartName != NULL) - { - HeapFree(GetProcessHeap(), 0, service->service_entry->config.lpServiceStartName); new_entry.config.lpServiceStartName = strdupW(lpServiceStartName); - } if (lpDisplayName != NULL) - { - HeapFree(GetProcessHeap(), 0, service->service_entry->config.lpDisplayName); new_entry.config.lpDisplayName = strdupW(lpDisplayName); - } - *service->service_entry = new_entry; - save_service_config(service->service_entry); + /* try to save to Registry, commit or rollback depending on success */ + err = save_service_config(&new_entry); + if (ERROR_SUCCESS == err) + { + free_config_strings(&service->service_entry->config,&new_entry.config); + *service->service_entry = new_entry; + } + else free_config_strings(&new_entry.config,&service->service_entry->config); service_unlock(service->service_entry); - return ERROR_SUCCESS; + return err; } DWORD svcctl_SetServiceStatus( diff --git a/programs/services/services.c b/programs/services/services.c index 24230e4..d6f5e6d 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -376,7 +376,7 @@ static DWORD scmdatabase_create(struct scmdatabase **db) InitializeCriticalSection(&(*db)->cs); err = RegCreateKeyExW(HKEY_LOCAL_MACHINE, SZ_SERVICES_KEY, 0, NULL, - REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, + REG_OPTION_NON_VOLATILE, MAXIMUM_ALLOWED, NULL, &(*db)->root_key, NULL); if (err != ERROR_SUCCESS) HeapFree(GetProcessHeap(), 0, *db); @@ -417,7 +417,7 @@ static DWORD scmdatabase_load_services(struct scmdatabase *db) break; WINE_TRACE("Loading service %s\n", wine_dbgstr_w(szName)); - err = RegOpenKeyExW(db->root_key, szName, 0, KEY_READ | KEY_WRITE, &hServiceKey); + err = RegOpenKeyExW(db->root_key, szName, 0, KEY_READ, &hServiceKey); if (err == ERROR_SUCCESS) { err = load_service_config(hServiceKey, entry);

1 0

Nathan Gallaher : ole32: Fix invalid memory access in storage32.
by Alexandre Julliard 07 Dec '09

07 Dec '09

Module: wine Branch: master Commit: de239d86fdf61fe1e09bde2aed4b4eb8cb45d49a URL: http://source.winehq.org/git/wine.git/?a=commit;h=de239d86fdf61fe1e09bde2ae… Author: Nathan Gallaher <ngallaher(a)deepthought.org> Date: Sun Dec 6 08:30:06 2009 -0500 ole32: Fix invalid memory access in storage32. --- dlls/ole32/storage32.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index f54bfdf..3263221 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -2280,9 +2280,7 @@ static HRESULT StorageImpl_Construct( goto end; } strcpyW(This->pwcsName, pwcsName); - - memcpy(This->base.filename, pwcsName, DIRENTRY_NAME_BUFFER_LEN-1); - This->base.filename[DIRENTRY_NAME_BUFFER_LEN-1] = 0; + lstrcpynW(This->base.filename, pwcsName, DIRENTRY_NAME_BUFFER_LEN); } /*

1 0

Piotr Caban : mshtml: Added OleObject_Advise implementation.
by Alexandre Julliard 07 Dec '09

07 Dec '09

Module: wine Branch: master Commit: bbfa604dc04990cdbaf89ccc9ea958a979f7790e URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbfa604dc04990cdbaf89ccc9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Dec 7 14:52:28 2009 +0100 mshtml: Added OleObject_Advise implementation. --- dlls/mshtml/htmldoc.c | 2 ++ dlls/mshtml/mshtml_private.h | 2 ++ dlls/mshtml/oleobj.c | 19 +++++++++++++++++-- 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 291bba5..b52005b 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1951,6 +1951,8 @@ static ULONG WINAPI CustomDoc_Release(ICustomDoc *iface) This->basedoc.window->doc_obj = NULL; IHTMLWindow2_Release(HTMLWINDOW2(This->basedoc.window)); } + if(This->basedoc.advise_holder) + IOleAdviseHolder_Release(This->basedoc.advise_holder); if(This->client) IOleObject_SetClientSite(OLEOBJ(&This->basedoc), NULL); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 4e02ce6..bf539d4 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -338,6 +338,8 @@ struct HTMLDocument { ConnectionPoint cp_htmldocevents; ConnectionPoint cp_htmldocevents2; ConnectionPoint cp_propnotif; + + IOleAdviseHolder *advise_holder; }; static inline HRESULT htmldoc_query_interface(HTMLDocument *This, REFIID riid, void **ppv) diff --git a/dlls/mshtml/oleobj.c b/dlls/mshtml/oleobj.c index e9cb204..7ae03a4 100644 --- a/dlls/mshtml/oleobj.c +++ b/dlls/mshtml/oleobj.c @@ -380,8 +380,23 @@ static HRESULT WINAPI OleObject_GetExtent(IOleObject *iface, DWORD dwDrawAspect, static HRESULT WINAPI OleObject_Advise(IOleObject *iface, IAdviseSink *pAdvSink, DWORD *pdwConnection) { HTMLDocument *This = OLEOBJ_THIS(iface); - FIXME("(%p)->(%p %p)\n", This, pAdvSink, pdwConnection); - return E_NOTIMPL; + TRACE("(%p)->(%p %p)\n", This, pAdvSink, pdwConnection); + + if(!pdwConnection) + return E_INVALIDARG; + + if(!pAdvSink) { + *pdwConnection = 0; + return E_INVALIDARG; + } + + if(!This->advise_holder) { + CreateOleAdviseHolder(&This->advise_holder); + if(!This->advise_holder) + return E_OUTOFMEMORY; + } + + return IOleAdviseHolder_Advise(This->advise_holder, pAdvSink, pdwConnection); } static HRESULT WINAPI OleObject_Unadvise(IOleObject *iface, DWORD dwConnection)

1 0

Stefan Dösinger : wined3d: Add a function for initializing surface sysmem.
by Alexandre Julliard 07 Dec '09

07 Dec '09

Module: wine Branch: master Commit: 54f0d3f785f4e9390fc3f47ca6e750513225d3a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54f0d3f785f4e9390fc3f47ca… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Dec 4 13:07:18 2009 +0100 wined3d: Add a function for initializing surface sysmem. --- dlls/wined3d/device.c | 36 +++++++++++++++++++++++++++--------- dlls/wined3d/surface.c | 40 +++++++++++++++++++++++++++++----------- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 57 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index cefabea..6ac60f1 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6514,7 +6514,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_EvictManagedResources(IWineD3DDevice* return WINED3D_OK; } -static void updateSurfaceDesc(IWineD3DSurfaceImpl *surface, const WINED3DPRESENT_PARAMETERS* pPresentationParameters) +static HRESULT updateSurfaceDesc(IWineD3DSurfaceImpl *surface, const WINED3DPRESENT_PARAMETERS* pPresentationParameters) { IWineD3DDeviceImpl *device = surface->resource.wineD3DDevice; const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; @@ -6567,12 +6567,14 @@ static void updateSurfaceDesc(IWineD3DSurfaceImpl *surface, const WINED3DPRESENT surface->resource.allocatedMemory = NULL; surface->resource.heapMemory = NULL; surface->resource.size = IWineD3DSurface_GetPitch((IWineD3DSurface *) surface) * surface->pow2Width; - /* INDRAWABLE is a sane place for implicit targets after the reset, INSYSMEM is more appropriate for depth stencils. */ - if (surface->resource.usage & WINED3DUSAGE_DEPTHSTENCIL) { - IWineD3DSurface_ModifyLocation((IWineD3DSurface *) surface, SFLAG_INSYSMEM, TRUE); - } else { - IWineD3DSurface_ModifyLocation((IWineD3DSurface *) surface, SFLAG_INDRAWABLE, TRUE); + + /* Put all surfaces into sysmem - the drawable might disappear if the backbuffer was rendered + * to a FBO */ + if(!surface_init_sysmem((IWineD3DSurface *) surface)) + { + return E_OUTOFMEMORY; } + return WINED3D_OK; } static HRESULT WINAPI reset_unload_resources(IWineD3DResource *resource, void *data) { @@ -6830,12 +6832,28 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Reset(IWineD3DDevice* iface, WINED3DPRE swapchain->presentParms.BackBufferWidth = pPresentationParameters->BackBufferWidth; swapchain->presentParms.BackBufferHeight = pPresentationParameters->BackBufferHeight; - updateSurfaceDesc((IWineD3DSurfaceImpl *)swapchain->frontBuffer, pPresentationParameters); + hr = updateSurfaceDesc((IWineD3DSurfaceImpl *)swapchain->frontBuffer, pPresentationParameters); + if(FAILED(hr)) + { + IWineD3DSwapChain_Release((IWineD3DSwapChain *) swapchain); + return hr; + } + for(i = 0; i < swapchain->presentParms.BackBufferCount; i++) { - updateSurfaceDesc((IWineD3DSurfaceImpl *)swapchain->backBuffer[i], pPresentationParameters); + hr = updateSurfaceDesc((IWineD3DSurfaceImpl *)swapchain->backBuffer[i], pPresentationParameters); + if(FAILED(hr)) + { + IWineD3DSwapChain_Release((IWineD3DSwapChain *) swapchain); + return hr; + } } if(This->auto_depth_stencil_buffer) { - updateSurfaceDesc((IWineD3DSurfaceImpl *)This->auto_depth_stencil_buffer, pPresentationParameters); + hr = updateSurfaceDesc((IWineD3DSurfaceImpl *)This->auto_depth_stencil_buffer, pPresentationParameters); + if(FAILED(hr)) + { + IWineD3DSwapChain_Release((IWineD3DSwapChain *) swapchain); + return hr; + } } } diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index d75c5e9..1463dd4 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -820,6 +820,30 @@ static void surface_remove_pbo(IWineD3DSurfaceImpl *This) { This->Flags &= ~SFLAG_PBO; } +BOOL surface_init_sysmem(IWineD3DSurface *iface) +{ + IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *) iface; + + if(!This->resource.allocatedMemory) + { + This->resource.heapMemory = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, This->resource.size + RESOURCE_ALIGNMENT); + if(!This->resource.heapMemory) + { + ERR("Out of memory\n"); + return FALSE; + } + This->resource.allocatedMemory = + (BYTE *)(((ULONG_PTR) This->resource.heapMemory + (RESOURCE_ALIGNMENT - 1)) & ~(RESOURCE_ALIGNMENT - 1)); + } + else + { + memset(This->resource.allocatedMemory, 0, This->resource.size); + } + + IWineD3DSurface_ModifyLocation(iface, SFLAG_INSYSMEM, TRUE); + return TRUE; +} + static void WINAPI IWineD3DSurfaceImpl_UnLoad(IWineD3DSurface *iface) { IWineD3DBaseTexture *texture = NULL; IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *) iface; @@ -836,18 +860,12 @@ static void WINAPI IWineD3DSurfaceImpl_UnLoad(IWineD3DSurface *iface) { * or depth stencil. The content may be destroyed, but we still have to tear down * opengl resources, so we cannot leave early. * - * Put the most up to date surface location into the drawable. D3D-wise this content - * is undefined, so it would be nowhere, but that would make the location management - * more complicated. The drawable is a sane location, because if we mark sysmem or - * texture up to date, drawPrim will copy the uninitialized texture or sysmem to the - * uninitialized drawable. That's pointless and we'd have to allocate the texture / - * sysmem copy here. + * Put the surfaces into sysmem, and reset the content. The D3D content is undefined, + * but we can't set the sysmem INDRAWABLE because when we're rendering the swapchain + * or the depth stencil into an FBO the texture or render buffer will be removed + * and all flags get lost */ - if (This->resource.usage & WINED3DUSAGE_DEPTHSTENCIL) { - IWineD3DSurface_ModifyLocation(iface, SFLAG_INSYSMEM, TRUE); - } else { - IWineD3DSurface_ModifyLocation(iface, SFLAG_INDRAWABLE, TRUE); - } + surface_init_sysmem(iface); } else { /* Load the surface into system memory */ IWineD3DSurface_LoadLocation(iface, SFLAG_INSYSMEM, NULL); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 39519a1..bd8e58f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1726,6 +1726,7 @@ typedef struct IWineD3DBaseTextureClass } IWineD3DBaseTextureClass; void surface_internal_preload(IWineD3DSurface *iface, enum WINED3DSRGB srgb) DECLSPEC_HIDDEN; +BOOL surface_init_sysmem(IWineD3DSurface *iface) DECLSPEC_HIDDEN; typedef struct IWineD3DBaseTextureImpl {

1 0

Stefan Dösinger : wined3d: A function for checking if a surface is offscreen.
by Alexandre Julliard 07 Dec '09

07 Dec '09

Module: wine Branch: master Commit: 64291c60cb1f73ea16f12c464bec5c014de3320c URL: http://source.winehq.org/git/wine.git/?a=commit;h=64291c60cb1f73ea16f12c464… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Dec 6 15:45:46 2009 +0100 wined3d: A function for checking if a surface is offscreen. --- dlls/wined3d/device.c | 8 +++--- dlls/wined3d/surface.c | 58 ++++++++++++++++++++++++---------------- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 40 insertions(+), 27 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 6ac60f1..12003d6 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5676,7 +5676,7 @@ static void color_fill_fbo(IWineD3DDevice *iface, IWineD3DSurface *surface, IWineD3DSwapChain *swapchain; swapchain = get_swapchain(surface); - if (swapchain) { + if (!surface_is_offscreen(surface)) { GLenum buffer; TRACE("Surface %p is onscreen\n", surface); @@ -5699,7 +5699,7 @@ static void color_fill_fbo(IWineD3DDevice *iface, IWineD3DSurface *surface, if (rect) { glEnable(GL_SCISSOR_TEST); - if(!swapchain) { + if(surface_is_offscreen(surface)) { glScissor(rect->x1, rect->y1, rect->x2 - rect->x1, rect->y2 - rect->y1); } else { glScissor(rect->x1, ((IWineD3DSurfaceImpl *)surface)->currentDesc.Height - rect->y2, @@ -6088,7 +6088,7 @@ void stretch_rect_fbo(IWineD3DDevice *iface, IWineD3DSurface *src_surface, WINED gl_info = context->gl_info; - if (src_swapchain) { + if (!surface_is_offscreen(src_surface)) { GLenum buffer = surface_get_gl_buffer(src_surface, src_swapchain); TRACE("Source surface %p is onscreen\n", src_surface); @@ -6126,7 +6126,7 @@ void stretch_rect_fbo(IWineD3DDevice *iface, IWineD3DSurface *src_surface, WINED LEAVE_GL(); /* Attach dst surface to dst fbo */ - if (dst_swapchain) { + if (!surface_is_offscreen(dst_surface)) { GLenum buffer = surface_get_gl_buffer(dst_surface, dst_swapchain); TRACE("Destination surface %p is onscreen\n", dst_surface); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 1463dd4..7c4551b 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -923,7 +923,6 @@ static void WINAPI IWineD3DSurfaceImpl_UnLoad(IWineD3DSurface *iface) { /* Read the framebuffer back into the surface */ static void read_from_framebuffer(IWineD3DSurfaceImpl *This, CONST RECT *rect, void *dest, UINT pitch) { - IWineD3DSwapChainImpl *swapchain; IWineD3DDeviceImpl *myDevice = This->resource.wineD3DDevice; struct wined3d_context *context; BYTE *mem; @@ -959,16 +958,8 @@ static void read_from_framebuffer(IWineD3DSurfaceImpl *This, CONST RECT *rect, v * There is no need to keep track of the current read buffer or reset it, every part of the code * that reads sets the read buffer as desired. */ - if (SUCCEEDED(IWineD3DSurface_GetContainer((IWineD3DSurface *) This, &IID_IWineD3DSwapChain, (void **)&swapchain))) + if (surface_is_offscreen((IWineD3DSurface *) This)) { - GLenum buffer = surface_get_gl_buffer((IWineD3DSurface *) This, (IWineD3DSwapChain *)swapchain); - TRACE("Locking %#x buffer\n", buffer); - glReadBuffer(buffer); - checkGLcall("glReadBuffer"); - - IWineD3DSwapChain_Release((IWineD3DSwapChain *) swapchain); - srcIsUpsideDown = FALSE; - } else { /* Locking the primary render target which is not on a swapchain(=offscreen render target). * Read from the back buffer */ @@ -976,6 +967,15 @@ static void read_from_framebuffer(IWineD3DSurfaceImpl *This, CONST RECT *rect, v glReadBuffer(myDevice->offscreenBuffer); srcIsUpsideDown = TRUE; } + else + { + /* Onscreen surfaces are always part of a swapchain */ + GLenum buffer = surface_get_gl_buffer((IWineD3DSurface *) This, (IWineD3DSwapChain *) This->container); + TRACE("Locking %#x buffer\n", buffer); + glReadBuffer(buffer); + checkGLcall("glReadBuffer"); + srcIsUpsideDown = FALSE; + } /* TODO: Get rid of the extra rectangle comparison and construction of a full surface rectangle */ if(!rect) { @@ -1770,7 +1770,7 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ *internal = glDesc->glGammaInternal; } else if (This->resource.usage & WINED3DUSAGE_RENDERTARGET - && !(This->Flags & SFLAG_SWAPCHAIN)) + && surface_is_offscreen((IWineD3DSurface *) This)) { *internal = glDesc->rtInternal; } else { @@ -3102,7 +3102,7 @@ static inline void fb_copy_to_texture_direct(IWineD3DSurfaceImpl *This, IWineD3D /* Bind the target texture */ glBindTexture(This->texture_target, This->texture_name); checkGLcall("glBindTexture"); - if(!swapchain) { + if(surface_is_offscreen(SrcSurface)) { TRACE("Reading from an offscreen target\n"); upsidedown = !upsidedown; glReadBuffer(myDevice->offscreenBuffer); @@ -3241,12 +3241,12 @@ static inline void fb_copy_to_texture_hwstretch(IWineD3DSurfaceImpl *This, IWine Src->Flags &= ~SFLAG_INTEXTURE; } - if(swapchain) { - glReadBuffer(surface_get_gl_buffer(SrcSurface, (IWineD3DSwapChain *)swapchain)); - } else { + if(surface_is_offscreen(SrcSurface)) { TRACE("Reading from an offscreen target\n"); upsidedown = !upsidedown; glReadBuffer(myDevice->offscreenBuffer); + } else { + glReadBuffer(surface_get_gl_buffer(SrcSurface, (IWineD3DSwapChain *)swapchain)); } /* TODO: Only back up the part that will be overwritten */ @@ -4562,13 +4562,15 @@ static void WINAPI IWineD3DSurfaceImpl_ModifyLocation(IWineD3DSurface *iface, DW persistent ? "TRUE" : "FALSE"); if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { - if (This->Flags & SFLAG_SWAPCHAIN) + if (surface_is_offscreen(iface)) { - TRACE("Surface %p is an onscreen surface\n", iface); - } else { /* With ORM_FBO, SFLAG_INTEXTURE and SFLAG_INDRAWABLE are the same for offscreen targets. */ if (flag & (SFLAG_INTEXTURE | SFLAG_INDRAWABLE)) flag |= (SFLAG_INTEXTURE | SFLAG_INDRAWABLE); } + else + { + TRACE("Surface %p is an onscreen surface\n", iface); + } } if(persistent) { @@ -4829,16 +4831,20 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadLocation(IWineD3DSurface *iface, D int width, pitch, outpitch; BYTE *mem; BOOL drawable_read_ok = TRUE; + BOOL in_fbo = FALSE; if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { - if (This->Flags & SFLAG_SWAPCHAIN) + if (surface_is_offscreen(iface)) { - TRACE("Surface %p is an onscreen surface\n", iface); - } else { /* With ORM_FBO, SFLAG_INTEXTURE and SFLAG_INDRAWABLE are the same for offscreen targets. * Prefer SFLAG_INTEXTURE. */ if (flag == SFLAG_INDRAWABLE) flag = SFLAG_INTEXTURE; drawable_read_ok = FALSE; + in_fbo = TRUE; + } + else + { + TRACE("Surface %p is an onscreen surface\n", iface); } } @@ -5063,8 +5069,7 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadLocation(IWineD3DSurface *iface, D This->Flags |= flag; } - if (wined3d_settings.offscreen_rendering_mode == ORM_FBO && !(This->Flags & SFLAG_SWAPCHAIN) - && (This->Flags & (SFLAG_INTEXTURE | SFLAG_INDRAWABLE))) { + if (in_fbo && (This->Flags & (SFLAG_INTEXTURE | SFLAG_INDRAWABLE))) { /* With ORM_FBO, SFLAG_INTEXTURE and SFLAG_INDRAWABLE are the same for offscreen targets. */ This->Flags |= (SFLAG_INTEXTURE | SFLAG_INDRAWABLE); } @@ -5121,6 +5126,13 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_DrawOverlay(IWineD3DSurface *iface) { return hr; } +BOOL surface_is_offscreen(IWineD3DSurface *iface) +{ + IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *) iface; + + return !(This->Flags & SFLAG_SWAPCHAIN); +} + const IWineD3DSurfaceVtbl IWineD3DSurface_Vtbl = { /* IUnknown */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index bd8e58f..4fb556c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1727,6 +1727,7 @@ typedef struct IWineD3DBaseTextureClass void surface_internal_preload(IWineD3DSurface *iface, enum WINED3DSRGB srgb) DECLSPEC_HIDDEN; BOOL surface_init_sysmem(IWineD3DSurface *iface) DECLSPEC_HIDDEN; +BOOL surface_is_offscreen(IWineD3DSurface *iface) DECLSPEC_HIDDEN; typedef struct IWineD3DBaseTextureImpl {

1 0