April 2011 - Wine-commits - list.winehq.org

Jacek Caban : shdocvw: Make tests stricter and fix GetUrl problem found by the change.
by Alexandre Julliard 08 Apr '11

08 Apr '11

Module: wine Branch: master Commit: 45c9ec0d55eaf4a7a81575979acd9e9c2db28c1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=45c9ec0d55eaf4a7a81575979… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 8 11:59:43 2011 +0200 shdocvw: Make tests stricter and fix GetUrl problem found by the change. --- dlls/shdocvw/intshcut.c | 37 ++++++++++++--------- dlls/shdocvw/tests/intshcut.c | 68 +++++++++++++++++++++-------------------- 2 files changed, 56 insertions(+), 49 deletions(-) diff --git a/dlls/shdocvw/intshcut.c b/dlls/shdocvw/intshcut.c index f86f122..4a2dd6a 100644 --- a/dlls/shdocvw/intshcut.c +++ b/dlls/shdocvw/intshcut.c @@ -238,18 +238,20 @@ static HRESULT WINAPI UniformResourceLocatorW_SetUrl(IUniformResourceLocatorW *u static HRESULT WINAPI UniformResourceLocatorW_GetUrl(IUniformResourceLocatorW *url, LPWSTR *ppszURL) { - HRESULT hr = S_OK; InternetShortcut *This = impl_from_IUniformResourceLocatorW(url); + TRACE("(%p, %p)\n", url, ppszURL); - if (This->url == NULL) + + if (!This->url) { *ppszURL = NULL; - else - { - *ppszURL = co_strdupW(This->url); - if (*ppszURL == NULL) - hr = E_OUTOFMEMORY; + return S_FALSE; } - return hr; + + *ppszURL = co_strdupW(This->url); + if (!*ppszURL) + return E_OUTOFMEMORY; + + return S_OK; } static HRESULT WINAPI UniformResourceLocatorW_InvokeCommand(IUniformResourceLocatorW *url, PURLINVOKECOMMANDINFOW pCommandInfo) @@ -339,18 +341,21 @@ static HRESULT WINAPI UniformResourceLocatorA_SetUrl(IUniformResourceLocatorA *u static HRESULT WINAPI UniformResourceLocatorA_GetUrl(IUniformResourceLocatorA *url, LPSTR *ppszURL) { - HRESULT hr = S_OK; InternetShortcut *This = impl_from_IUniformResourceLocatorA(url); + TRACE("(%p, %p)\n", url, ppszURL); - if (This->url == NULL) + + if (!This->url) { *ppszURL = NULL; - else - { - *ppszURL = co_strdupWtoA(This->url); - if (*ppszURL == NULL) - hr = E_OUTOFMEMORY; + return S_FALSE; + } - return hr; + + *ppszURL = co_strdupWtoA(This->url); + if (!*ppszURL) + return E_OUTOFMEMORY; + + return S_OK; } static HRESULT WINAPI UniformResourceLocatorA_InvokeCommand(IUniformResourceLocatorA *url, PURLINVOKECOMMANDINFOA pCommandInfo) diff --git a/dlls/shdocvw/tests/intshcut.c b/dlls/shdocvw/tests/intshcut.c index 023df4d..108e4f5 100644 --- a/dlls/shdocvw/tests/intshcut.c +++ b/dlls/shdocvw/tests/intshcut.c @@ -89,17 +89,17 @@ static void test_Aggregability(void) IUnknown *pUnknown = NULL; hr = CoCreateInstance(&CLSID_InternetShortcut, NULL, CLSCTX_ALL, &IID_IUnknown, (void**)&pUnknown); - ok(SUCCEEDED(hr), "could not create instance of CLSID_InternetShortcut with IID_IUnknown, hr = 0x%x\n", hr); + ok(hr == S_OK, "could not create instance of CLSID_InternetShortcut with IID_IUnknown, hr = 0x%x\n", hr); if (pUnknown) IUnknown_Release(pUnknown); hr = CoCreateInstance(&CLSID_InternetShortcut, NULL, CLSCTX_ALL, &IID_IUniformResourceLocatorA, (void**)&pUnknown); - ok(SUCCEEDED(hr), "could not create instance of CLSID_InternetShortcut with IID_IUniformResourceLocatorA, hr = 0x%x\n", hr); + ok(hr == S_OK, "could not create instance of CLSID_InternetShortcut with IID_IUniformResourceLocatorA, hr = 0x%x\n", hr); if (pUnknown) IUnknown_Release(pUnknown); hr = CoCreateInstance(&CLSID_InternetShortcut, &unknown, CLSCTX_ALL, &IID_IUnknown, (void**)&pUnknown); - ok(FAILED(hr), "aggregation didn't fail like it should, hr = 0x%x\n", hr); + ok(hr == CLASS_E_NOAGGREGATION, "aggregation didn't fail like it should, hr = 0x%x\n", hr); if (pUnknown) IUnknown_Release(pUnknown); } @@ -109,7 +109,7 @@ static void can_query_interface(IUnknown *pUnknown, REFIID riid) HRESULT hr; IUnknown *newInterface; hr = IUnknown_QueryInterface(pUnknown, riid, (void**)&newInterface); - ok(SUCCEEDED(hr), "interface %s could not be queried\n", printGUID(riid)); + ok(hr == S_OK, "interface %s could not be queried\n", printGUID(riid)); if (SUCCEEDED(hr)) IUnknown_Release(newInterface); } @@ -128,32 +128,36 @@ static void test_QueryInterface(void) IUnknown_Release(pUnknown); } -static CHAR *set_and_get_url(IUniformResourceLocatorA *urlA, LPCSTR input, DWORD flags) +#define check_string_transform(a,b,c,d,e) _check_string_transform(__LINE__,a,b,c,d,e) +static void _check_string_transform(unsigned line, IUniformResourceLocatorA *urlA, LPCSTR input, DWORD flags, + LPCSTR expectedOutput, BOOL is_todo) { + CHAR *output; HRESULT hr; + hr = urlA->lpVtbl->SetURL(urlA, input, flags); - if (SUCCEEDED(hr)) - { - CHAR *output; - hr = urlA->lpVtbl->GetURL(urlA, &output); - if (SUCCEEDED(hr)) - return output; - else - skip("GetUrl failed, hr=0x%x\n", hr); - } - else - skip("SetUrl (%s, 0x%x) failed, hr=0x%x\n", input, flags, hr); - return NULL; -} + ok_(__FILE__,line)(hr == S_OK, "SetUrl failed, hr=0x%x\n", hr); + if (FAILED(hr)) + return; -static void check_string_transform(IUniformResourceLocatorA *urlA, LPCSTR input, DWORD flags, LPCSTR expectedOutput) -{ - CHAR *output = set_and_get_url(urlA, input, flags); - if (output != NULL) - { - ok(lstrcmpA(output, expectedOutput) == 0, "unexpected URL change %s -> %s (expected %s)\n", + output = (void*)0xdeadbeef; + hr = urlA->lpVtbl->GetURL(urlA, &output); + if(expectedOutput) { + if(is_todo) { + todo_wine + ok_(__FILE__,line)(hr == S_OK, "GetUrl failed, hr=0x%x\n", hr); + }else { + ok_(__FILE__,line)(hr == S_OK, "GetUrl failed, hr=0x%x\n", hr); + } + todo_wine + ok_(__FILE__,line)(!lstrcmpA(output, expectedOutput), "unexpected URL change %s -> %s (expected %s)\n", input, output, expectedOutput); CoTaskMemFree(output); + }else { + todo_wine + ok_(__FILE__,line)(hr == S_FALSE, "GetUrl failed, hr=0x%x\n", hr); + todo_wine + ok_(__FILE__,line)(!output, "GetUrl returned %s\n", output); } } @@ -297,14 +301,14 @@ static void test_NullURLs(void) ok(hr == S_OK, "Could not create InternetShortcut object: %08x\n", hr); hr = urlA->lpVtbl->GetURL(urlA, &url); - ok(SUCCEEDED(hr), "getting uninitialized URL unexpectedly failed, hr=0x%x\n", hr); + ok(hr == S_FALSE, "getting uninitialized URL unexpectedly failed, hr=0x%x\n", hr); ok(url == NULL, "uninitialized URL is not NULL but %s\n", url); hr = urlA->lpVtbl->SetURL(urlA, NULL, 0); - ok(SUCCEEDED(hr), "setting NULL URL unexpectedly failed, hr=0x%x\n", hr); + ok(hr == S_OK, "setting NULL URL unexpectedly failed, hr=0x%x\n", hr); hr = urlA->lpVtbl->GetURL(urlA, &url); - ok(SUCCEEDED(hr), "getting NULL URL unexpectedly failed, hr=0x%x\n", hr); + ok(hr == S_FALSE, "getting NULL URL unexpectedly failed, hr=0x%x\n", hr); ok(url == NULL, "URL unexpectedly not NULL but %s\n", url); urlA->lpVtbl->Release(urlA); @@ -318,13 +322,11 @@ static void test_SetURLFlags(void) hr = CoCreateInstance(&CLSID_InternetShortcut, NULL, CLSCTX_ALL, &IID_IUniformResourceLocatorA, (void**)&urlA); ok(hr == S_OK, "Could not create InternetShortcut object: %08x\n", hr); - check_string_transform(urlA, "somerandomstring", 0, "somerandomstring"); - check_string_transform(urlA, "www.winehq.org", 0, "www.winehq.org"); + check_string_transform(urlA, "somerandomstring", 0, NULL, TRUE); + check_string_transform(urlA, "www.winehq.org", 0, NULL, TRUE); - todo_wine - check_string_transform(urlA, "www.winehq.org", IURL_SETURL_FL_GUESS_PROTOCOL, "http://www.winehq.org/"); - todo_wine - check_string_transform(urlA, "ftp.winehq.org", IURL_SETURL_FL_GUESS_PROTOCOL, "ftp://ftp.winehq.org/"); + check_string_transform(urlA, "www.winehq.org", IURL_SETURL_FL_GUESS_PROTOCOL, "http://www.winehq.org/", FALSE); + check_string_transform(urlA, "ftp.winehq.org", IURL_SETURL_FL_GUESS_PROTOCOL, "ftp://ftp.winehq.org/", FALSE); urlA->lpVtbl->Release(urlA); }

1 0

Alexandre Julliard : gdi32: Avoid reading bits outside of the glyph bitmap in GetGlyphOutline.
by Alexandre Julliard 08 Apr '11

08 Apr '11

Module: wine Branch: master Commit: 05b1aea24439a1c01a72026ba8f996d0d018b5e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05b1aea24439a1c01a72026ba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 8 12:38:32 2011 +0200 gdi32: Avoid reading bits outside of the glyph bitmap in GetGlyphOutline. --- dlls/gdi32/freetype.c | 13 +++++-------- 1 files changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index aefb0e8..03a4cbd 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -4939,14 +4939,10 @@ DWORD WineEngGetGlyphOutline(GdiFont *incoming_font, UINT glyph, UINT format, BYTE *src = ft_face->glyph->bitmap.buffer, *dst = buf; INT h = ft_face->glyph->bitmap.rows; INT x; + memset( buf, 0, needed ); while(h--) { - for(x = 0; x < pitch; x++) - { - if(x < ft_face->glyph->bitmap.width) - dst[x] = (src[x / 8] & (1 << ( (7 - (x % 8))))) ? 0xff : 0; - else - dst[x] = 0; - } + for(x = 0; x < pitch && x < ft_face->glyph->bitmap.width; x++) + if (src[x / 8] & (1 << ( (7 - (x % 8))))) dst[x] = 0xff; src += ft_face->glyph->bitmap.pitch; dst += pitch; } @@ -5025,9 +5021,10 @@ DWORD WineEngGetGlyphOutline(GdiFont *incoming_font, UINT glyph, UINT format, src = ft_face->glyph->bitmap.buffer; src_pitch = ft_face->glyph->bitmap.pitch; + height = min( height, ft_face->glyph->bitmap.rows ); while ( height-- ) { - for (x = 0; x < width; x++) + for (x = 0; x < width && x < ft_face->glyph->bitmap.width; x++) { if ( src[x / 8] & (1 << ( (7 - (x % 8)))) ) ((unsigned int *)dst)[x] = ~0u;

1 0

Dmitry Timoshkov : user32: Use symbolic names for values returned by WM_MENUCHAR handler.
by Alexandre Julliard 08 Apr '11

08 Apr '11

Module: wine Branch: master Commit: 094db744ce9272343bccf218d22570e2b1c4e7ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=094db744ce9272343bccf218d… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Fri Apr 8 20:49:15 2011 +0900 user32: Use symbolic names for values returned by WM_MENUCHAR handler. --- dlls/user32/menu.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 4d2edf8..0e2d9fb 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -784,8 +784,8 @@ static UINT MENU_FindItemByKey( HWND hwndOwner, HMENU hmenu, } menuchar = SendMessageW( hwndOwner, WM_MENUCHAR, MAKEWPARAM( key, menu->wFlags ), (LPARAM)hmenu ); - if (HIWORD(menuchar) == 2) return LOWORD(menuchar); - if (HIWORD(menuchar) == 1) return (UINT)(-2); + if (HIWORD(menuchar) == MNC_EXECUTE) return LOWORD(menuchar); + if (HIWORD(menuchar) == MNC_CLOSE) return (UINT)(-2); } return (UINT)(-1); }

1 0

Jacek Caban : mshtml: Reimplement nsIURI::SetHost on top of IUriBuilder.
by Alexandre Julliard 08 Apr '11

08 Apr '11

Module: wine Branch: master Commit: 593d3f4492f4057ddc4e9cdd3e9b47a995e9f12f URL: http://source.winehq.org/git/wine.git/?a=commit;h=593d3f4492f4057ddc4e9cdd3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 8 13:04:14 2011 +0200 mshtml: Reimplement nsIURI::SetHost on top of IUriBuilder. --- dlls/mshtml/nsio.c | 26 +++++++++++++++++--------- 1 files changed, 17 insertions(+), 9 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index b25aae0..bd6a411 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1921,25 +1921,33 @@ static nsresult NSAPI nsURI_GetHost(nsIURL *iface, nsACString *aHost) TRACE("(%p)->(%p)\n", This, aHost); - if(This->nsuri) - return nsIURI_GetHost(This->nsuri, aHost); - return get_uri_string(This, Uri_PROPERTY_HOST, aHost); } static nsresult NSAPI nsURI_SetHost(nsIURL *iface, const nsACString *aHost) { nsWineURI *This = impl_from_nsIURL(iface); + const char *hosta; + WCHAR *host; + HRESULT hres; TRACE("(%p)->(%s)\n", This, debugstr_nsacstr(aHost)); - if(This->nsuri) { - invalidate_uri(This); - return nsIURI_SetHost(This->nsuri, aHost); - } + if(!ensure_uri_builder(This)) + return NS_ERROR_UNEXPECTED; - FIXME("default action not implemented\n"); - return NS_ERROR_NOT_IMPLEMENTED; + nsACString_GetData(aHost, &hosta); + host = heap_strdupAtoW(hosta); + if(!host) + return NS_ERROR_OUT_OF_MEMORY; + + hres = IUriBuilder_SetHost(This->uri_builder, host); + heap_free(host); + if(FAILED(hres)) + return NS_ERROR_UNEXPECTED; + + sync_wine_url(This); + return NS_OK; } static nsresult NSAPI nsURI_GetPort(nsIURL *iface, PRInt32 *aPort)

1 0

Henri Verbeet : wined3d: Only create a swapchain context array for GL swapchains.
by Alexandre Julliard 08 Apr '11

08 Apr '11

Module: wine Branch: master Commit: 28137ba2e9a829e2f9a44cdf804eb5c315d2a7ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=28137ba2e9a829e2f9a44cdf8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 8 14:30:59 2011 +0200 wined3d: Only create a swapchain context array for GL swapchains. Lying about the number of contexts a swapchain has isn't very useful. --- dlls/wined3d/swapchain.c | 22 +++++++++------------- 1 files changed, 9 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 1c875bf..ddd946d 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1043,15 +1043,6 @@ HRESULT swapchain_init(IWineD3DSwapChainImpl *swapchain, WINED3DSURFTYPE surface displaymode_set = TRUE; } - swapchain->context = HeapAlloc(GetProcessHeap(), 0, sizeof(swapchain->context)); - if (!swapchain->context) - { - ERR("Failed to create the context array.\n"); - hr = E_OUTOFMEMORY; - goto err; - } - swapchain->num_contexts = 1; - if (surface_type == SURFACE_OPENGL) { static const enum wined3d_format_id formats[] = @@ -1065,6 +1056,15 @@ HRESULT swapchain_init(IWineD3DSwapChainImpl *swapchain, WINED3DSURFTYPE surface const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; + swapchain->context = HeapAlloc(GetProcessHeap(), 0, sizeof(swapchain->context)); + if (!swapchain->context) + { + ERR("Failed to create the context array.\n"); + hr = E_OUTOFMEMORY; + goto err; + } + swapchain->num_contexts = 1; + /* In WGL both color, depth and stencil are features of a pixel format. In case of D3D they are separate. * You are able to add a depth + stencil surface at a later stage when you need it. * In order to support this properly in WineD3D we need the ability to recreate the opengl context and @@ -1099,10 +1099,6 @@ HRESULT swapchain_init(IWineD3DSwapChainImpl *swapchain, WINED3DSURFTYPE surface } context_release(swapchain->context[0]); } - else - { - swapchain->context[0] = NULL; - } if (swapchain->presentParms.BackBufferCount > 0) {

1 0

Henri Verbeet : wined3d: Merge the IWineD3DSwapChain::Destroy() implementations.
by Alexandre Julliard 08 Apr '11

08 Apr '11

Module: wine Branch: master Commit: d19c3588bc3c6fa8a6cf4fa42efeb5a3746b4ee6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d19c3588bc3c6fa8a6cf4fa42… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 7 18:46:00 2011 +0200 wined3d: Merge the IWineD3DSwapChain::Destroy() implementations. They're mostly the same, except for the GL version also destroying its contexts, and being a bit more careful about the order in which backbuffers are destroyed. --- dlls/wined3d/swapchain.c | 175 ++++++++++++++++----------------------------- 1 files changed, 62 insertions(+), 113 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index ddd946d..4ab2209 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -25,6 +25,65 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); WINE_DECLARE_DEBUG_CHANNEL(fps); +/* Do not call while under the GL lock. */ +static void WINAPI IWineD3DBaseSwapChainImpl_Destroy(IWineD3DSwapChain *iface) +{ + IWineD3DSwapChainImpl *swapchain = (IWineD3DSwapChainImpl *)iface; + WINED3DDISPLAYMODE mode; + UINT i; + + TRACE("Destroying swapchain %p.\n", iface); + + IWineD3DSwapChain_SetGammaRamp(iface, 0, &swapchain->orig_gamma); + + /* Release the swapchain's draw buffers. Make sure swapchain->back_buffers[0] + * is the last buffer to be destroyed, FindContext() depends on that. */ + if (swapchain->front_buffer) + { + surface_set_container(swapchain->front_buffer, WINED3D_CONTAINER_NONE, NULL); + if (IWineD3DSurface_Release((IWineD3DSurface *)swapchain->front_buffer)) + WARN("Something's still holding the front buffer (%p).\n", swapchain->front_buffer); + swapchain->front_buffer = NULL; + } + + if (swapchain->back_buffers) + { + i = swapchain->presentParms.BackBufferCount; + + while (i--) + { + surface_set_container(swapchain->back_buffers[i], WINED3D_CONTAINER_NONE, NULL); + if (IWineD3DSurface_Release((IWineD3DSurface *)swapchain->back_buffers[i])) + WARN("Something's still holding back buffer %u (%p).\n", i, swapchain->back_buffers[i]); + } + HeapFree(GetProcessHeap(), 0, swapchain->back_buffers); + swapchain->back_buffers = NULL; + } + + for (i = 0; i < swapchain->num_contexts; ++i) + { + context_destroy(swapchain->device, swapchain->context[i]); + } + + /* Restore the screen resolution if we rendered in fullscreen. + * This will restore the screen resolution to what it was before creating + * the swapchain. In case of d3d8 and d3d9 this will be the original + * desktop resolution. In case of d3d7 this will be a NOP because ddraw + * sets the resolution before starting up Direct3D, thus orig_width and + * orig_height will be equal to the modes in the presentation params. */ + if (!swapchain->presentParms.Windowed && swapchain->presentParms.AutoRestoreDisplayMode) + { + mode.Width = swapchain->orig_width; + mode.Height = swapchain->orig_height; + mode.RefreshRate = 0; + mode.Format = swapchain->orig_fmt; + IWineD3DDevice_SetDisplayMode((IWineD3DDevice *)swapchain->device, 0, &mode); + } + + HeapFree(GetProcessHeap(), 0, swapchain->context); + HeapFree(GetProcessHeap(), 0, swapchain); +} + static HRESULT WINAPI IWineD3DBaseSwapChainImpl_QueryInterface(IWineD3DSwapChain *iface, REFIID riid, void **object) { TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); @@ -63,7 +122,7 @@ static ULONG WINAPI IWineD3DBaseSwapChainImpl_Release(IWineD3DSwapChain *iface) TRACE("%p decreasing refcount to %u.\n", swapchain, refcount); if (!refcount) - IWineD3DSwapChain_Destroy(iface); + IWineD3DBaseSwapChainImpl_Destroy(iface); return refcount; } @@ -213,67 +272,6 @@ static HRESULT WINAPI IWineD3DBaseSwapChainImpl_GetGammaRamp(IWineD3DSwapChain * return WINED3D_OK; } -/* Do not call while under the GL lock. */ -static void WINAPI IWineD3DSwapChainImpl_Destroy(IWineD3DSwapChain *iface) -{ - IWineD3DSwapChainImpl *This = (IWineD3DSwapChainImpl *)iface; - WINED3DDISPLAYMODE mode; - unsigned int i; - - TRACE("Destroying swapchain %p\n", iface); - - IWineD3DSwapChain_SetGammaRamp(iface, 0, &This->orig_gamma); - - /* Release the swapchain's draw buffers. Make sure This->back_buffers[0] is - * the last buffer to be destroyed, FindContext() depends on that. */ - if (This->front_buffer) - { - surface_set_container(This->front_buffer, WINED3D_CONTAINER_NONE, NULL); - if (IWineD3DSurface_Release((IWineD3DSurface *)This->front_buffer)) - { - WARN("(%p) Something's still holding the front buffer (%p).\n", - This, This->front_buffer); - } - This->front_buffer = NULL; - } - - if (This->back_buffers) - { - UINT i = This->presentParms.BackBufferCount; - - while (i--) - { - surface_set_container(This->back_buffers[i], WINED3D_CONTAINER_NONE, NULL); - if (IWineD3DSurface_Release((IWineD3DSurface *)This->back_buffers[i])) - WARN("(%p) Something's still holding back buffer %u (%p).\n", - This, i, This->back_buffers[i]); - } - HeapFree(GetProcessHeap(), 0, This->back_buffers); - This->back_buffers = NULL; - } - - for (i = 0; i < This->num_contexts; ++i) - { - context_destroy(This->device, This->context[i]); - } - /* Restore the screen resolution if we rendered in fullscreen - * This will restore the screen resolution to what it was before creating the swapchain. In case of d3d8 and d3d9 - * this will be the original desktop resolution. In case of d3d7 this will be a NOP because ddraw sets the resolution - * before starting up Direct3D, thus orig_width and orig_height will be equal to the modes in the presentation params - */ - if (!This->presentParms.Windowed && This->presentParms.AutoRestoreDisplayMode) - { - mode.Width = This->orig_width; - mode.Height = This->orig_height; - mode.RefreshRate = 0; - mode.Format = This->orig_fmt; - IWineD3DDevice_SetDisplayMode((IWineD3DDevice *)This->device, 0, &mode); - } - - HeapFree(GetProcessHeap(), 0, This->context); - HeapFree(GetProcessHeap(), 0, This); -} - /* A GL context is provided by the caller */ static void swapchain_blit(IWineD3DSwapChainImpl *This, struct wined3d_context *context, const RECT *src_rect, const RECT *dst_rect) @@ -658,7 +656,7 @@ static const IWineD3DSwapChainVtbl IWineD3DSwapChain_Vtbl = IWineD3DBaseSwapChainImpl_Release, /* IWineD3DSwapChain */ IWineD3DBaseSwapChainImpl_GetParent, - IWineD3DSwapChainImpl_Destroy, + IWineD3DBaseSwapChainImpl_Destroy, IWineD3DBaseSwapChainImpl_GetDevice, IWineD3DSwapChainImpl_Present, IWineD3DSwapChainImpl_SetDestWindowOverride, @@ -671,55 +669,6 @@ static const IWineD3DSwapChainVtbl IWineD3DSwapChain_Vtbl = IWineD3DBaseSwapChainImpl_GetGammaRamp }; -static void WINAPI IWineGDISwapChainImpl_Destroy(IWineD3DSwapChain *iface) -{ - IWineD3DSwapChainImpl *swapchain = (IWineD3DSwapChainImpl *)iface; - WINED3DDISPLAYMODE mode; - - TRACE("Destroying swapchain %p.\n", iface); - - IWineD3DSwapChain_SetGammaRamp(iface, 0, &swapchain->orig_gamma); - - /* release the ref to the front and back buffer parents */ - if (swapchain->front_buffer) - { - surface_set_container(swapchain->front_buffer, WINED3D_CONTAINER_NONE, NULL); - if (IWineD3DSurface_Release((IWineD3DSurface *)swapchain->front_buffer)) - WARN("Something's still holding the front buffer.\n"); - } - - if (swapchain->back_buffers) - { - UINT i; - - for (i = 0; i < swapchain->presentParms.BackBufferCount; ++i) - { - surface_set_container(swapchain->back_buffers[i], WINED3D_CONTAINER_NONE, NULL); - if (IWineD3DSurface_Release((IWineD3DSurface *)swapchain->back_buffers[i])) - WARN("Something's still holding the back buffer.\n"); - } - HeapFree(GetProcessHeap(), 0, swapchain->back_buffers); - } - - /* Restore the screen resolution if we rendered in fullscreen. - * This will restore the screen resolution to what it was before creating - * the swapchain. In case of d3d8 and d3d9 this will be the original - * desktop resolution. In case of d3d7 this will be a NOP because ddraw - * sets the resolution before starting up Direct3D, thus orig_width and - * orig_height will be equal to the modes in the presentation params. */ - if (!swapchain->presentParms.Windowed && swapchain->presentParms.AutoRestoreDisplayMode) - { - mode.Width = swapchain->orig_width; - mode.Height = swapchain->orig_height; - mode.RefreshRate = 0; - mode.Format = swapchain->orig_fmt; - IWineD3DDevice_SetDisplayMode((IWineD3DDevice *)swapchain->device, 0, &mode); - } - - HeapFree(GetProcessHeap(), 0, swapchain->context); - HeapFree(GetProcessHeap(), 0, swapchain); -} - /* Helper function that blits the front buffer contents to the target window. */ void x11_copy_to_screen(IWineD3DSwapChainImpl *swapchain, const RECT *rect) { @@ -896,7 +845,7 @@ static const IWineD3DSwapChainVtbl IWineGDISwapChain_Vtbl = IWineD3DBaseSwapChainImpl_Release, /* IWineD3DSwapChain */ IWineD3DBaseSwapChainImpl_GetParent, - IWineGDISwapChainImpl_Destroy, + IWineD3DBaseSwapChainImpl_Destroy, IWineD3DBaseSwapChainImpl_GetDevice, IWineGDISwapChainImpl_Present, IWineGDISwapChainImpl_SetDestWindowOverride,

1 0

Henri Verbeet : wined3d: Don' t free D3D swapchains until the wined3d swapchain is destroyed.
by Alexandre Julliard 08 Apr '11

08 Apr '11

Module: wine Branch: master Commit: dd2c7d0d8c61ab226789b860990095ff91c608fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd2c7d0d8c61ab226789b8609… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 7 18:46:01 2011 +0200 wined3d: Don't free D3D swapchains until the wined3d swapchain is destroyed. This will allow us the get rid of the swapchain refcounting hacks in d3d9 in particular. This is similar to the way we handle resources that are still in use by a stateblock, but aren't referenced anywhere by the application. --- dlls/d3d8/swapchain.c | 31 +++++++++++++++++++++++++++---- dlls/d3d9/swapchain.c | 28 ++++++++++++++++++++++++---- dlls/ddraw/ddraw.c | 2 +- dlls/dxgi/swapchain.c | 18 +++++++++++++++--- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/swapchain.c | 5 ++++- dlls/wined3d/wined3d_private.h | 4 +++- include/wine/wined3d.idl | 1 + 8 files changed, 77 insertions(+), 16 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dd2c7d0d8c61ab226789b…

1 0

Maarten Lankhorst : dsound: COM cleanup property sets.
by Alexandre Julliard 08 Apr '11

08 Apr '11

Module: wine Branch: master Commit: 442925735878fcf3ba985520da125c8c68c9c430 URL: http://source.winehq.org/git/wine.git/?a=commit;h=442925735878fcf3ba985520d… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Apr 8 14:11:34 2011 +0200 dsound: COM cleanup property sets. --- dlls/dsound/dsound_private.h | 15 +-------------- dlls/dsound/propset.c | 29 ++++++++++++++++++++--------- 2 files changed, 21 insertions(+), 23 deletions(-) diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index 542b997..e5ef75c 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -57,7 +57,6 @@ typedef struct IDirectSoundCaptureNotifyImpl IDirectSoundCaptureNotifyImpl; typedef struct IDirectSound3DListenerImpl IDirectSound3DListenerImpl; typedef struct IDirectSound3DBufferImpl IDirectSound3DBufferImpl; typedef struct IKsBufferPropertySetImpl IKsBufferPropertySetImpl; -typedef struct IKsPrivatePropertySetImpl IKsPrivatePropertySetImpl; typedef struct PrimaryBufferImpl PrimaryBufferImpl; typedef struct SecondaryBufferImpl SecondaryBufferImpl; typedef struct DirectSoundDevice DirectSoundDevice; @@ -329,19 +328,7 @@ HRESULT IKsBufferPropertySetImpl_Create( HRESULT IKsBufferPropertySetImpl_Destroy( IKsBufferPropertySetImpl *piks); -/***************************************************************************** - * IKsPrivatePropertySet implementation structure - */ -struct IKsPrivatePropertySetImpl -{ - /* IUnknown fields */ - const IKsPropertySetVtbl *lpVtbl; - LONG ref; -}; - -HRESULT IKsPrivatePropertySetImpl_Create( - REFIID riid, - IKsPrivatePropertySetImpl **piks); +HRESULT IKsPrivatePropertySetImpl_Create(REFIID riid, IKsPropertySet **piks); /***************************************************************************** * IDirectSound3DBuffer implementation structure diff --git a/dlls/dsound/propset.c b/dlls/dsound/propset.c index 04c7b58..f6c8091 100644 --- a/dlls/dsound/propset.c +++ b/dlls/dsound/propset.c @@ -44,6 +44,17 @@ WINE_DEFAULT_DEBUG_CHANNEL(dsound); +typedef struct IKsPrivatePropertySetImpl +{ + IKsPropertySet IKsPropertySet_iface; + LONG ref; +} IKsPrivatePropertySetImpl; + +static IKsPrivatePropertySetImpl *impl_from_IKsPropertySet(IKsPropertySet *iface) +{ + return CONTAINING_RECORD(iface, IKsPrivatePropertySetImpl, IKsPropertySet_iface); +} + /******************************************************************************* * IKsPrivatePropertySet */ @@ -54,7 +65,7 @@ static HRESULT WINAPI IKsPrivatePropertySetImpl_QueryInterface( REFIID riid, LPVOID *ppobj ) { - IKsPrivatePropertySetImpl *This = (IKsPrivatePropertySetImpl *)iface; + IKsPrivatePropertySetImpl *This = impl_from_IKsPropertySet(iface); TRACE("(%p,%s,%p)\n",This,debugstr_guid(riid),ppobj); if (IsEqualIID(riid, &IID_IUnknown) || @@ -69,7 +80,7 @@ static HRESULT WINAPI IKsPrivatePropertySetImpl_QueryInterface( static ULONG WINAPI IKsPrivatePropertySetImpl_AddRef(LPKSPROPERTYSET iface) { - IKsPrivatePropertySetImpl *This = (IKsPrivatePropertySetImpl *)iface; + IKsPrivatePropertySetImpl *This = impl_from_IKsPropertySet(iface); ULONG ref = InterlockedIncrement(&(This->ref)); TRACE("(%p) ref was %d\n", This, ref - 1); return ref; @@ -77,7 +88,7 @@ static ULONG WINAPI IKsPrivatePropertySetImpl_AddRef(LPKSPROPERTYSET iface) static ULONG WINAPI IKsPrivatePropertySetImpl_Release(LPKSPROPERTYSET iface) { - IKsPrivatePropertySetImpl *This = (IKsPrivatePropertySetImpl *)iface; + IKsPrivatePropertySetImpl *This = impl_from_IKsPropertySet(iface); ULONG ref = InterlockedDecrement(&(This->ref)); TRACE("(%p) ref was %d\n", This, ref + 1); @@ -514,7 +525,7 @@ static HRESULT WINAPI IKsPrivatePropertySetImpl_Get( ULONG cbPropData, PULONG pcbReturned ) { - IKsPrivatePropertySetImpl *This = (IKsPrivatePropertySetImpl *)iface; + IKsPrivatePropertySetImpl *This = impl_from_IKsPropertySet(iface); TRACE("(iface=%p,guidPropSet=%s,dwPropID=%d,pInstanceData=%p,cbInstanceData=%d,pPropData=%p,cbPropData=%d,pcbReturned=%p)\n", This,debugstr_guid(guidPropSet),dwPropID,pInstanceData,cbInstanceData,pPropData,cbPropData,pcbReturned); @@ -561,7 +572,7 @@ static HRESULT WINAPI IKsPrivatePropertySetImpl_Set( LPVOID pPropData, ULONG cbPropData ) { - IKsPrivatePropertySetImpl *This = (IKsPrivatePropertySetImpl *)iface; + IKsPrivatePropertySetImpl *This = impl_from_IKsPropertySet(iface); FIXME("(%p,%s,%d,%p,%d,%p,%d), stub!\n",This,debugstr_guid(guidPropSet),dwPropID,pInstanceData,cbInstanceData,pPropData,cbPropData); return E_PROP_ID_UNSUPPORTED; @@ -573,7 +584,7 @@ static HRESULT WINAPI IKsPrivatePropertySetImpl_QuerySupport( ULONG dwPropID, PULONG pTypeSupport ) { - IKsPrivatePropertySetImpl *This = (IKsPrivatePropertySetImpl *)iface; + IKsPrivatePropertySetImpl *This = impl_from_IKsPropertySet(iface); TRACE("(%p,%s,%d,%p)\n",This,debugstr_guid(guidPropSet),dwPropID,pTypeSupport); if ( IsEqualGUID( &DSPROPSETID_DirectSoundDevice, guidPropSet) ) { @@ -624,7 +635,7 @@ static const IKsPropertySetVtbl ikspvt = { HRESULT IKsPrivatePropertySetImpl_Create( REFIID riid, - IKsPrivatePropertySetImpl **piks) + IKsPropertySet **piks) { IKsPrivatePropertySetImpl *iks; TRACE("(%s, %p)\n", debugstr_guid(riid), piks); @@ -637,8 +648,8 @@ HRESULT IKsPrivatePropertySetImpl_Create( iks = HeapAlloc(GetProcessHeap(),0,sizeof(*iks)); iks->ref = 1; - iks->lpVtbl = &ikspvt; + iks->IKsPropertySet_iface.lpVtbl = &ikspvt; - *piks = iks; + *piks = &iks->IKsPropertySet_iface; return S_OK; }

1 0

Francois Gouget : winhlp32: Add support for accelerators in general and F1 in particular.
by Alexandre Julliard 08 Apr '11

08 Apr '11

1 0

Jacek Caban : shdocvw: Moved more registration to .rgs file.
by Alexandre Julliard 08 Apr '11

08 Apr '11

Module: wine Branch: master Commit: 439f9109fcd5c7049f894899a55b92c7daa4d1ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=439f9109fcd5c7049f894899a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 8 11:57:24 2011 +0200 shdocvw: Moved more registration to .rgs file. --- dlls/shdocvw/shdocvw.inf | 21 +-------------- dlls/shdocvw/shdocvw.rc | 3 ++ dlls/shdocvw/shdocvw.rgs | 63 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 68 insertions(+), 19 deletions(-) diff --git a/dlls/shdocvw/shdocvw.inf b/dlls/shdocvw/shdocvw.inf index ea6effa..2cf9d6e 100644 --- a/dlls/shdocvw/shdocvw.inf +++ b/dlls/shdocvw/shdocvw.inf @@ -3,11 +3,11 @@ Signature="$CHICAGO$" [RegisterDll] -AddReg=Classes.Reg, URL.Reg +AddReg=Classes.Reg [UnregisterDll] -DelReg=Classes.Reg, URL.Reg +DelReg=Classes.Reg [RegisterIE] @@ -30,23 +30,6 @@ HKCR,"CLSID\%CLSID_Internet%\Shell\OpenHomePage",,,"Open &Home Page" HKCR,"CLSID\%CLSID_Internet%\Shell\OpenHomePage\Command",,,"""%16422%\Internet Explorer\iexplore.exe""" HKCR,"CLSID\%CLSID_Internet%\ShellFolder",,2,"0x24" -HKCR,"CLSID\%CLSID_InternetShortcut%\shellex\MayChangeDefaultMenu",,16 -HKCR,"InternetShortcut","EditFlags",2,"2" -HKCR,"InternetShortcut","IsShortcut",, -HKCR,"InternetShortcut","NeverShowExt",, -HKCR,"InternetShortcut\DefaultIcon",,,"url.dll,0" -HKCR,"InternetShortcut\shell\open\command",,,"rundll32.exe shdocvw.dll,OpenURL %l" -HKCR,"InternetShortcut\shell\print\command",,,"rundll32.exe mshtml.dll,PrintHTML ""%1""" -HKCR,"InternetShortcut\shell\printto\command",,,"rundll32.exe mshtml.dll,PrintHTML ""%1"" ""%2"" ""%3"" ""%4""" - -[URL.Reg] -HKLM,"Software\Microsoft\Windows\CurrentVersion\URL\DefaultPrefix",,,"http://" -HKLM,"Software\Microsoft\Windows\CurrentVersion\URL\Prefixes","ftp",,"ftp://" -HKLM,"Software\Microsoft\Windows\CurrentVersion\URL\Prefixes","gopher",,"gopher://" -HKLM,"Software\Microsoft\Windows\CurrentVersion\URL\Prefixes","home",,"http://" -HKLM,"Software\Microsoft\Windows\CurrentVersion\URL\Prefixes","mosaic",,"http://" -HKLM,"Software\Microsoft\Windows\CurrentVersion\URL\Prefixes","www",,"http://" - [Settings.Reg] HKCU,"Software\Microsoft\Internet Explorer\Main","Start Page",2,"http://www.winehq.org" diff --git a/dlls/shdocvw/shdocvw.rc b/dlls/shdocvw/shdocvw.rc index 1c73163..943d7a5 100644 --- a/dlls/shdocvw/shdocvw.rc +++ b/dlls/shdocvw/shdocvw.rc @@ -91,5 +91,8 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL /* @makedep: shdocvw.inf */ REGINST REGINST shdocvw.inf +/* @makedep: shdocvw.rgs */ +2 WINE_REGISTRY shdocvw.rgs + /* @makedep: ietoolbar.bmp */ IDB_IETOOLBAR BITMAP ietoolbar.bmp diff --git a/dlls/shdocvw/shdocvw.rgs b/dlls/shdocvw/shdocvw.rgs new file mode 100644 index 0000000..a983458 --- /dev/null +++ b/dlls/shdocvw/shdocvw.rgs @@ -0,0 +1,63 @@ +HKLM +{ + NoRemove 'Software' + { + NoRemove 'Microsoft' + { + NoRemove 'Windows' + { + NoRemove 'CurrentVersion' + { + NoRemove 'URL' + { + DefaultPrefix = s 'http://' + Prefixes + { + val 'ftp' = s 'ftp://' + val 'gopher' = s 'gopher://' + val 'home' = s 'http://' + val 'mosaic' = s 'http://' + val 'www' = s 'http://' + } + } + } + } + } + } +} + +HKCR +{ + NoRemove CLSID + { + '{fbf23b40-e3f0-101b-8488-00aa003e56f8}' + { + shellex + { + MayChangeDefaultMenu {} + } + } + } + 'InternetShortcut' + { + val 'EditFlags' = s '2' + val 'IsShortcut' = s '' + val 'NeverShowExt' = s '' + DefaultIcon = s 'url.dll,0' + shell + { + open + { + command = s 'rundll32.exe shdocvw.dll,OpenURL %%l' + } + print + { + command = s 'rundll32.exe mshtml.dll,PrintHTML ""%%1""' + } + printto + { + command = s 'rundll32.exe mshtml.dll,PrintHTML ""%%1"" ""%%2"" ""%%3"" ""%%4""' + } + } + } +}

1 0