July 2012 - Wine-commits - list.winehq.org

Henri Verbeet : wined3d: Fix the draw buffer limit calculation.
by Alexandre Julliard 19 Jul '12

19 Jul '12

Module: wine Branch: master Commit: f1aea860f9b83e07e24c6e517daabfb4df7e04c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1aea860f9b83e07e24c6e517… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 18 21:32:32 2012 +0200 wined3d: Fix the draw buffer limit calculation. --- dlls/wined3d/directx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 9e9af8a..eb900b0 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2403,7 +2403,7 @@ static void wined3d_adapter_init_limits(struct wined3d_gl_info *gl_info) gl_info->limits.general_combiners = gl_max; TRACE("Max general combiners: %d.\n", gl_max); } - if (gl_info->supported[ARB_DRAW_BUFFERS] && wined3d_settings.offscreen_rendering_mode != ORM_FBO) + if (gl_info->supported[ARB_DRAW_BUFFERS] && wined3d_settings.offscreen_rendering_mode == ORM_FBO) { glGetIntegerv(GL_MAX_DRAW_BUFFERS_ARB, &gl_max); gl_info->limits.buffers = gl_max;

1 0

Henri Verbeet : wined3d: Disable the X11 / GL lock.
by Alexandre Julliard 19 Jul '12

19 Jul '12

Module: wine Branch: master Commit: 8a95eb060449e93bc38af1cabc928f0a959e9e14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a95eb060449e93bc38af1cab… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 18 21:32:33 2012 +0200 wined3d: Disable the X11 / GL lock. --- dlls/wined3d/wined3d_private.h | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 08e9370..bc9523f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -785,11 +785,11 @@ extern void (CDECL *wine_tsx11_unlock_ptr)(void) DECLSPEC_HIDDEN; extern int num_lock DECLSPEC_HIDDEN; #if 0 -#define ENTER_GL() ++num_lock; if (num_lock > 1) FIXME("Recursive use of GL lock to: %d\n", num_lock); wine_tsx11_lock_ptr() -#define LEAVE_GL() if (num_lock != 1) FIXME("Recursive use of GL lock: %d\n", num_lock); --num_lock; wine_tsx11_unlock_ptr() -#else #define ENTER_GL() wine_tsx11_lock_ptr() #define LEAVE_GL() wine_tsx11_unlock_ptr() +#else +#define ENTER_GL() do {} while(0) +#define LEAVE_GL() do {} while(0) #endif /*****************************************************************************

1 0

Henri Verbeet : wined3d: Enable "AlwaysOffscreen" by default.
by Alexandre Julliard 19 Jul '12

19 Jul '12

Module: wine Branch: master Commit: 09443f14e75e134328643b5d33aff61bdf4dca32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09443f14e75e134328643b5d3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 18 21:32:34 2012 +0200 wined3d: Enable "AlwaysOffscreen" by default. --- dlls/d3d8/tests/visual.c | 20 +++++++++++--------- dlls/d3d9/tests/visual.c | 23 +++++++++++++---------- dlls/wined3d/wined3d_main.c | 8 ++++---- 3 files changed, 28 insertions(+), 23 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 191cf08..6aaf365 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -1983,11 +1983,6 @@ static void depth_buffer_test(IDirect3DDevice8 *device) hr = IDirect3DDevice8_SetRenderTarget(device, backbuffer, depth_stencil); ok(SUCCEEDED(hr), "SetRenderTarget failed, hr %#x.\n", hr); - IDirect3DSurface8_Release(depth_stencil); - IDirect3DSurface8_Release(backbuffer); - IDirect3DSurface8_Release(rt3); - IDirect3DSurface8_Release(rt2); - IDirect3DSurface8_Release(rt1); hr = IDirect3DDevice8_SetRenderState(device, D3DRS_ZWRITEENABLE, FALSE); ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr); @@ -2015,6 +2010,12 @@ static void depth_buffer_test(IDirect3DDevice8 *device) hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Present failed (0x%08x)\n", hr); + + IDirect3DSurface8_Release(depth_stencil); + IDirect3DSurface8_Release(backbuffer); + IDirect3DSurface8_Release(rt3); + IDirect3DSurface8_Release(rt2); + IDirect3DSurface8_Release(rt1); } /* Test that partial depth copies work the way they're supposed to. The clear @@ -2086,10 +2087,6 @@ static void depth_buffer2_test(IDirect3DDevice8 *device) hr = IDirect3DDevice8_SetRenderTarget(device, backbuffer, depth_stencil); ok(SUCCEEDED(hr), "SetRenderTarget failed, hr %#x.\n", hr); - IDirect3DSurface8_Release(depth_stencil); - IDirect3DSurface8_Release(backbuffer); - IDirect3DSurface8_Release(rt2); - IDirect3DSurface8_Release(rt1); hr = IDirect3DDevice8_SetRenderState(device, D3DRS_ZWRITEENABLE, FALSE); ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr); @@ -2115,6 +2112,11 @@ static void depth_buffer2_test(IDirect3DDevice8 *device) hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Present failed (0x%08x)\n", hr); + + IDirect3DSurface8_Release(depth_stencil); + IDirect3DSurface8_Release(backbuffer); + IDirect3DSurface8_Release(rt2); + IDirect3DSurface8_Release(rt1); } static void intz_test(IDirect3DDevice8 *device) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index be2d7dc..a67ce52 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -11362,10 +11362,6 @@ static void depth_buffer_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_SetRenderTarget(device, 0, backbuffer); ok(SUCCEEDED(hr), "SetRenderTarget failed, hr %#x.\n", hr); - IDirect3DSurface9_Release(backbuffer); - IDirect3DSurface9_Release(rt3); - IDirect3DSurface9_Release(rt2); - IDirect3DSurface9_Release(rt1); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZWRITEENABLE, FALSE); ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr); @@ -11393,6 +11389,11 @@ static void depth_buffer_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Present failed (0x%08x)\n", hr); + + IDirect3DSurface9_Release(backbuffer); + IDirect3DSurface9_Release(rt3); + IDirect3DSurface9_Release(rt2); + IDirect3DSurface9_Release(rt1); } /* Test that partial depth copies work the way they're supposed to. The clear @@ -11461,9 +11462,6 @@ static void depth_buffer2_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_SetRenderTarget(device, 0, backbuffer); ok(SUCCEEDED(hr), "SetRenderTarget failed, hr %#x.\n", hr); - IDirect3DSurface9_Release(backbuffer); - IDirect3DSurface9_Release(rt2); - IDirect3DSurface9_Release(rt1); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZWRITEENABLE, FALSE); ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr); @@ -11489,6 +11487,10 @@ static void depth_buffer2_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Present failed (0x%08x)\n", hr); + + IDirect3DSurface9_Release(backbuffer); + IDirect3DSurface9_Release(rt2); + IDirect3DSurface9_Release(rt1); } static void depth_blit_test(IDirect3DDevice9 *device) @@ -11595,9 +11597,6 @@ static void depth_blit_test(IDirect3DDevice9 *device) ok(SUCCEEDED(hr), "Clear failed, hr %#x.\n", hr); hr = IDirect3DDevice9_StretchRect(device, ds2, NULL, ds1, NULL, D3DTEXF_POINT); ok(SUCCEEDED(hr), "StretchRect failed, hr %#x.\n", hr); - IDirect3DSurface9_Release(ds3); - IDirect3DSurface9_Release(ds2); - IDirect3DSurface9_Release(ds1); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZWRITEENABLE, FALSE); ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr); @@ -11624,6 +11623,10 @@ static void depth_blit_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Present failed (0x%08x)\n", hr); + + IDirect3DSurface9_Release(ds3); + IDirect3DSurface9_Release(ds2); + IDirect3DSurface9_Release(ds1); } static void intz_test(IDirect3DDevice9 *device) diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 526c749..fb8493c 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -87,7 +87,7 @@ struct wined3d_settings wined3d_settings = NULL, /* No wine logo by default */ TRUE, /* Multisampling enabled by default. */ FALSE, /* No strict draw ordering. */ - FALSE, /* Try to render onscreen by default. */ + TRUE, /* Don't try to render onscreen by default. */ }; /* Do not call while under the GL lock. */ @@ -338,10 +338,10 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) wined3d_settings.strict_draw_ordering = TRUE; } if (!get_config_key(hkey, appkey, "AlwaysOffscreen", buffer, size) - && !strcmp(buffer,"enabled")) + && !strcmp(buffer,"disabled")) { - TRACE("Always rendering backbuffers offscreen.\n"); - wined3d_settings.always_offscreen = TRUE; + TRACE("Not always rendering backbuffers offscreen.\n"); + wined3d_settings.always_offscreen = FALSE; } } if (wined3d_settings.vs_mode == VS_HW)

1 0

Nikolay Sivov : msxml3: Accept selection namespaces string with trailing spaces.
by Alexandre Julliard 19 Jul '12

19 Jul '12

Module: wine Branch: master Commit: c3fd306f611e4e5b73797168de87537d5a6fefa7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3fd306f611e4e5b73797168d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jul 19 10:24:43 2012 +0400 msxml3: Accept selection namespaces string with trailing spaces. --- dlls/msxml3/domdoc.c | 3 +++ dlls/msxml3/tests/domdoc.c | 6 ++++++ 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 0f3eb50..c2dbe03 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -2872,6 +2872,9 @@ static HRESULT WINAPI domdoc_setProperty( while (*pTokEnd != ' ' && *pTokEnd != 0) ++pTokEnd; + /* so it failed to advance which means we've got some trailing spaces */ + if (pTokEnd == pTokBegin) break; + if (xmlStrncmp(pTokBegin, (xmlChar const*)"xmlns", 5) != 0) { hr = E_FAIL; diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index dfa6126..817cf97 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -5738,22 +5738,27 @@ static const selection_ns_t selection_ns_data[] = { { &CLSID_DOMDocument, "CLSID_DOMDocument", "\txmlns:test='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29'", S_OK }, { &CLSID_DOMDocument, "CLSID_DOMDocument", "\n\rxmlns:test='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29'", S_OK }, { &CLSID_DOMDocument, "CLSID_DOMDocument", " xmlns:test='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29'", S_OK }, + { &CLSID_DOMDocument, "CLSID_DOMDocument", "xmlns:test='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29' ", S_OK }, { &CLSID_DOMDocument2, "CLSID_DOMDocument2", "\txmlns:test='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29'", S_OK }, { &CLSID_DOMDocument2, "CLSID_DOMDocument2", "\n\rxmlns:test='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29'", S_OK }, { &CLSID_DOMDocument2, "CLSID_DOMDocument2", " xmlns:test='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29'", S_OK }, + { &CLSID_DOMDocument2, "CLSID_DOMDocument2", "xmlns:test='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29' ", S_OK }, { &CLSID_DOMDocument30, "CLSID_DOMDocument30", "\txmlns:test='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29'", S_OK }, { &CLSID_DOMDocument30, "CLSID_DOMDocument30", "\n\rxmlns:test='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29'", S_OK }, { &CLSID_DOMDocument30, "CLSID_DOMDocument30", " xmlns:test='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29'", S_OK }, + { &CLSID_DOMDocument30, "CLSID_DOMDocument30", "xmlns:test='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29' ", S_OK }, { &CLSID_DOMDocument40, "CLSID_DOMDocument40", "\txmlns:test='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29'", S_OK }, { &CLSID_DOMDocument40, "CLSID_DOMDocument40", "\n\rxmlns:test='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29'", S_OK }, { &CLSID_DOMDocument40, "CLSID_DOMDocument40", " xmlns:test='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29'", S_OK }, + { &CLSID_DOMDocument40, "CLSID_DOMDocument40", "xmlns:test='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29' ", S_OK }, { &CLSID_DOMDocument60, "CLSID_DOMDocument60", "\txmlns:test='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29'", S_OK }, { &CLSID_DOMDocument60, "CLSID_DOMDocument60", "\n\rxmlns:test='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29'", S_OK }, { &CLSID_DOMDocument60, "CLSID_DOMDocument60", " xmlns:test='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29'", S_OK }, + { &CLSID_DOMDocument60, "CLSID_DOMDocument60", "xmlns:test='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29' ", S_OK }, { NULL } }; @@ -6054,6 +6059,7 @@ if (0) IXMLDOMDocument2_Release(doc); ptr++; + free_bstrs(); } free_bstrs();

1 0

Nikolay Sivov : ole32: Use a single implementation for 1Ole stream initialization.
by Alexandre Julliard 19 Jul '12

19 Jul '12

Module: wine Branch: master Commit: 24a690e90e70228be6040bf8a370e7b9d55343ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=24a690e90e70228be6040bf8a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jul 19 10:35:08 2012 +0400 ole32: Use a single implementation for 1Ole stream initialization. --- dlls/ole32/defaulthandler.c | 37 ++++++------------------------------- 1 files changed, 6 insertions(+), 31 deletions(-) diff --git a/dlls/ole32/defaulthandler.c b/dlls/ole32/defaulthandler.c index 68d85ec..b43b962 100644 --- a/dlls/ole32/defaulthandler.c +++ b/dlls/ole32/defaulthandler.c @@ -58,6 +58,7 @@ #include "ole2.h" #include "compobj_private.h" +#include "storage32.h" #include "wine/unicode.h" #include "wine/debug.h" @@ -1583,10 +1584,8 @@ static HRESULT WINAPI DefaultHandler_IPersistStorage_IsDirty( } /*********************************************************************** - * init_ole_stream * - * Creates the '\1Ole' stream. - * The format of this stream is as follows: + * The format of '\1Ole' stream is as follows: * * DWORD Version == 0x02000001 * DWORD Flags - low bit set indicates the object is a link otherwise it's embedded. @@ -1611,29 +1610,6 @@ typedef struct } ole_stream_header_t; static const DWORD ole_stream_version = 0x02000001; -static void init_ole_stream(IStorage *storage) -{ - HRESULT hr; - IStream *stream; - - hr = IStorage_CreateStream(storage, OleStream, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, 0, &stream); - if(SUCCEEDED(hr)) - { - DWORD written; - ole_stream_header_t header; - - header.version = ole_stream_version; - header.flags = 0; - header.link_update_opt = 0; - header.res = 0; - header.moniker_size = 0; - - IStream_Write(stream, &header, sizeof(header), &written); - IStream_Release(stream); - } - return; -} - static HRESULT load_ole_stream(DefaultHandler *This, IStorage *storage) { IStream *stream; @@ -1663,10 +1639,8 @@ static HRESULT load_ole_stream(DefaultHandler *This, IStorage *storage) IStream_Release(stream); } else - { - init_ole_stream(storage); - hr = S_OK; - } + hr = STORAGE_CreateOleStream(storage, 0); + return hr; } @@ -1682,7 +1656,8 @@ static HRESULT WINAPI DefaultHandler_IPersistStorage_InitNew( HRESULT hr; TRACE("(%p)->(%p)\n", iface, pStg); - init_ole_stream(pStg); + hr = STORAGE_CreateOleStream(pStg, 0); + if (hr != S_OK) return hr; hr = IPersistStorage_InitNew(This->dataCache_PersistStg, pStg);

1 0

Heiko Hund : winhttp: Make strings in WINHTTP_PROXY_INFO non-const.
by Alexandre Julliard 19 Jul '12

19 Jul '12

Module: wine Branch: master Commit: 1ba968821a45fe1d590bd3bf8c6b97eb1f0c8a12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ba968821a45fe1d590bd3bf8… Author: Heiko Hund <heiko.hund(a)sophos.com> Date: Thu Jul 19 08:22:59 2012 +0000 winhttp: Make strings in WINHTTP_PROXY_INFO non-const. --- dlls/winhttp/request.c | 16 ++++++++-------- dlls/winhttp/session.c | 8 ++++---- dlls/winhttp/tests/notification.c | 4 ++-- dlls/winhttp/tests/winhttp.c | 12 ++++++------ include/winhttp.h | 4 ++-- 5 files changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 8870e50..8109290 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2238,8 +2238,8 @@ static void free_request( struct winhttp_request *request ) CloseHandle( request->thread ); CloseHandle( request->wait ); CloseHandle( request->cancel ); - heap_free( (WCHAR *)request->proxy.lpszProxy ); - heap_free( (WCHAR *)request->proxy.lpszProxyBypass ); + heap_free( request->proxy.lpszProxy ); + heap_free( request->proxy.lpszProxyBypass ); heap_free( request->buffer ); heap_free( request->verb ); VariantClear( &request->data ); @@ -2430,16 +2430,16 @@ static HRESULT WINAPI winhttp_request_SetProxy( { case HTTPREQUEST_PROXYSETTING_DEFAULT: request->proxy.dwAccessType = WINHTTP_ACCESS_TYPE_DEFAULT_PROXY; - heap_free( (WCHAR *)request->proxy.lpszProxy ); - heap_free( (WCHAR *)request->proxy.lpszProxyBypass ); + heap_free( request->proxy.lpszProxy ); + heap_free( request->proxy.lpszProxyBypass ); request->proxy.lpszProxy = NULL; request->proxy.lpszProxyBypass = NULL; break; case HTTPREQUEST_PROXYSETTING_DIRECT: request->proxy.dwAccessType = WINHTTP_ACCESS_TYPE_NO_PROXY; - heap_free( (WCHAR *)request->proxy.lpszProxy ); - heap_free( (WCHAR *)request->proxy.lpszProxyBypass ); + heap_free( request->proxy.lpszProxy ); + heap_free( request->proxy.lpszProxyBypass ); request->proxy.lpszProxy = NULL; request->proxy.lpszProxyBypass = NULL; break; @@ -2448,12 +2448,12 @@ static HRESULT WINAPI winhttp_request_SetProxy( request->proxy.dwAccessType = WINHTTP_ACCESS_TYPE_NAMED_PROXY; if (V_VT( &proxy_server ) == VT_BSTR) { - heap_free( (WCHAR *)request->proxy.lpszProxy ); + heap_free( request->proxy.lpszProxy ); request->proxy.lpszProxy = strdupW( V_BSTR( &proxy_server ) ); } if (V_VT( &bypass_list ) == VT_BSTR) { - heap_free( (WCHAR *)request->proxy.lpszProxyBypass ); + heap_free( request->proxy.lpszProxyBypass ); request->proxy.lpszProxyBypass = strdupW( V_BSTR( &bypass_list ) ); } break; diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index b4a46e0..e3e5e2b 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -229,14 +229,14 @@ HINTERNET WINAPI WinHttpOpen( LPCWSTR agent, DWORD access, LPCWSTR proxy, LPCWST session->access = info.dwAccessType; if (info.lpszProxy && !(session->proxy_server = strdupW( info.lpszProxy ))) { - GlobalFree( (LPWSTR)info.lpszProxy ); - GlobalFree( (LPWSTR)info.lpszProxyBypass ); + GlobalFree( info.lpszProxy ); + GlobalFree( info.lpszProxyBypass ); goto end; } if (info.lpszProxyBypass && !(session->proxy_bypass = strdupW( info.lpszProxyBypass ))) { - GlobalFree( (LPWSTR)info.lpszProxy ); - GlobalFree( (LPWSTR)info.lpszProxyBypass ); + GlobalFree( info.lpszProxy ); + GlobalFree( info.lpszProxyBypass ); goto end; } } diff --git a/dlls/winhttp/tests/notification.c b/dlls/winhttp/tests/notification.c index 84a3569..8ef2115 100644 --- a/dlls/winhttp/tests/notification.c +++ b/dlls/winhttp/tests/notification.c @@ -68,9 +68,9 @@ static BOOL proxy_active(void) { active = (proxy_info.lpszProxy != NULL); if (active) - GlobalFree((HGLOBAL) proxy_info.lpszProxy); + GlobalFree(proxy_info.lpszProxy); if (proxy_info.lpszProxyBypass != NULL) - GlobalFree((HGLOBAL) proxy_info.lpszProxyBypass); + GlobalFree(proxy_info.lpszProxyBypass); } else active = FALSE; diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 9d75dbf..3bc686f 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -46,9 +46,9 @@ static BOOL proxy_active(void) { active = (proxy_info.lpszProxy != NULL); if (active) - GlobalFree((HGLOBAL) proxy_info.lpszProxy); + GlobalFree(proxy_info.lpszProxy); if (proxy_info.lpszProxyBypass != NULL) - GlobalFree((HGLOBAL) proxy_info.lpszProxyBypass); + GlobalFree(proxy_info.lpszProxyBypass); } else active = FALSE; @@ -1005,8 +1005,8 @@ static void set_default_proxy_reg_value( BYTE *buf, DWORD len, DWORD type ) static void test_set_default_proxy_config(void) { - static const WCHAR wideString[] = { 0x226f, 0x575b, 0 }; - static const WCHAR normalString[] = { 'f','o','o',0 }; + static WCHAR wideString[] = { 0x226f, 0x575b, 0 }; + static WCHAR normalString[] = { 'f','o','o',0 }; DWORD type, len; BYTE *saved_proxy_settings = NULL; WINHTTP_PROXY_INFO info; @@ -2699,8 +2699,8 @@ static void test_WinHttpGetProxyForUrl(void) trace("%u\n", info.dwAccessType); trace("%s\n", wine_dbgstr_w(info.lpszProxy)); trace("%s\n", wine_dbgstr_w(info.lpszProxyBypass)); - GlobalFree( (WCHAR *)info.lpszProxy ); - GlobalFree( (WCHAR *)info.lpszProxyBypass ); + GlobalFree( info.lpszProxy ); + GlobalFree( info.lpszProxyBypass ); } WinHttpCloseHandle( session ); } diff --git a/include/winhttp.h b/include/winhttp.h index b54bd92..cf0da83 100644 --- a/include/winhttp.h +++ b/include/winhttp.h @@ -487,8 +487,8 @@ typedef struct typedef struct { DWORD dwAccessType; - LPCWSTR lpszProxy; - LPCWSTR lpszProxyBypass; + LPWSTR lpszProxy; + LPWSTR lpszProxyBypass; } WINHTTP_PROXY_INFO, *LPWINHTTP_PROXY_INFO; typedef WINHTTP_PROXY_INFO WINHTTP_PROXY_INFOW; typedef LPWINHTTP_PROXY_INFO LPWINHTTP_PROXY_INFOW;

1 0

Michael Stefaniuc : dsound/tests: Add IDirectSound refcount and COM aggregation tests.
by Alexandre Julliard 19 Jul '12

19 Jul '12

Module: wine Branch: master Commit: e236a3c2d539250d66fc64ad9cb2c681f1e3dcea URL: http://source.winehq.org/git/wine.git/?a=commit;h=e236a3c2d539250d66fc64ad9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 19 10:48:26 2012 +0200 dsound/tests: Add IDirectSound refcount and COM aggregation tests. --- dlls/dsound/tests/dsound.c | 8 ++++++- dlls/dsound/tests/dsound8.c | 51 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 1 deletions(-) diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c index 4c46f67..894079d 100644 --- a/dlls/dsound/tests/dsound.c +++ b/dlls/dsound/tests/dsound.c @@ -173,7 +173,7 @@ EXIT: static void IDirectSound_tests(void) { HRESULT rc; - LPDIRECTSOUND dso=NULL; + IDirectSound *dso=(IDirectSound*)0xdeadbeef; LPCLASSFACTORY cf=NULL; trace("Testing IDirectSound\n"); @@ -188,6 +188,12 @@ static void IDirectSound_tests(void) ok(rc==S_OK,"CoGetClassObject(CLSID_DirectSound, IID_IUnknown) " "failed: %08x\n", rc); + /* COM aggregation */ + rc=CoCreateInstance(&CLSID_DirectSound, (IUnknown*)&dso, CLSCTX_INPROC_SERVER, + &IID_IDirectSound, (void**)&dso); + ok(rc==CLASS_E_NOAGGREGATION || broken(rc==DSERR_INVALIDPARAM), + "DirectMusicPerformance create failed: %08x, expected CLASS_E_NOAGGREGATION\n", rc); + /* try the COM class factory method of creation with no device specified */ rc=CoCreateInstance(&CLSID_DirectSound, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectSound, (void**)&dso); diff --git a/dlls/dsound/tests/dsound8.c b/dlls/dsound/tests/dsound8.c index c1e672f..d76d4f6 100644 --- a/dlls/dsound/tests/dsound8.c +++ b/dlls/dsound/tests/dsound8.c @@ -1116,6 +1116,56 @@ static void test_first_device(void) ok(hr == S_OK, "DirectSoundEnumerateA failed: %08x\n", hr); } +static void test_COM(void) +{ + IDirectSound *ds; + IDirectSound8 *ds8 = (IDirectSound8*)0xdeadbeef; + IUnknown *unk, *unk8; + ULONG refcount; + HRESULT hr; + + /* COM aggregation */ + hr = CoCreateInstance(&CLSID_DirectSound8, (IUnknown*)&ds, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void**)&ds8); + ok(hr == CLASS_E_NOAGGREGATION, + "DirectSound create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); + ok(!ds8, "ds8 = %p\n", ds8); + + /* Invalid RIID */ + hr = CoCreateInstance(&CLSID_DirectSound8, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectSound3DBuffer, (void**)&ds8); + ok(hr == E_NOINTERFACE, + "DirectSound create failed: %08x, expected E_NOINTERFACE\n", hr); + + /* Same refcount for IDirectSound and IDirectSound8 */ + hr = CoCreateInstance(&CLSID_DirectSound8, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectSound8, + (void**)&ds8); + ok(hr == S_OK, "DirectSound create failed: %08x, expected S_OK\n", hr); + refcount = IDirectSound8_AddRef(ds8); + ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + hr = IDirectSound8_QueryInterface(ds8, &IID_IDirectSound, (void**)&ds); + ok(hr == S_OK, "QueryInterface for IID_IDirectSound failed: %08x\n", hr); + refcount = IDirectSound8_AddRef(ds8); + todo_wine ok(refcount == 4, "refcount == %u, expected 4\n", refcount); + refcount = IDirectSound_AddRef(ds); + todo_wine ok(refcount == 5, "refcount == %u, expected 5\n", refcount); + + /* Separate refcount for IUnknown */ + hr = IDirectSound_QueryInterface(ds, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); + refcount = IUnknown_AddRef(unk); + ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + hr = IDirectSound_QueryInterface(ds8, &IID_IUnknown, (void**)&unk8); + ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); + refcount = IUnknown_AddRef(unk8); + ok(refcount == 4, "refcount == %u, expected 4\n", refcount); + refcount = IDirectSound_AddRef(ds); + todo_wine ok(refcount == 6, "refcount == %u, expected 6\n", refcount); + + while (IDirectSound_Release(ds)); + while (IUnknown_Release(unk)); +} + START_TEST(dsound8) { HMODULE hDsound; @@ -1132,6 +1182,7 @@ START_TEST(dsound8) "DirectSoundCreate8"); if (pDirectSoundCreate8) { + test_COM(); IDirectSound8_tests(); dsound8_tests(); test_hw_buffers();

1 0

Michael Stefaniuc : dsound: Merge the two IUnknown/ IDirectSound implementations for DirectSound.
by Alexandre Julliard 19 Jul '12

19 Jul '12

Module: wine Branch: master Commit: 4992e6a5158fc525f2da5aacedcbace645d1c60c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4992e6a5158fc525f2da5aace… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 19 01:49:53 2012 +0200 dsound: Merge the two IUnknown/IDirectSound implementations for DirectSound. --- dlls/dsound/dsound.c | 322 ++---------------------------------------- dlls/dsound/dsound_private.h | 2 - 2 files changed, 10 insertions(+), 314 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4992e6a5158fc525f2da5…

1 0

Michael Stefaniuc : dsound: Rename the DirectSound object refcount to " numIfaces".
by Alexandre Julliard 19 Jul '12

19 Jul '12

Module: wine Branch: master Commit: a565c0fadf2b55a70ce634fd582e1b854f316c5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a565c0fadf2b55a70ce634fd5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 19 01:51:26 2012 +0200 dsound: Rename the DirectSound object refcount to "numIfaces". --- dlls/dsound/dsound.c | 52 ++++++++++++++++--------------------------------- 1 files changed, 17 insertions(+), 35 deletions(-) diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index 7f5d288..e59f176 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -77,9 +77,8 @@ static ULONG WINAPI IDirectSound8_IDirectSound8_AddRef(LPDIRECTSOUND8 iface); */ struct IDirectSoundImpl { - LONG ref; - - DirectSoundDevice *device; + LONG numIfaces; + DirectSoundDevice *device; BOOL has_ds8; LPUNKNOWN pUnknown; LPDIRECTSOUND pDS; @@ -217,29 +216,12 @@ static HRESULT DSOUND_QueryInterface( return E_NOINTERFACE; } -static ULONG IDirectSoundImpl_AddRef( - LPDIRECTSOUND8 iface) -{ - IDirectSoundImpl *This = (IDirectSoundImpl *)iface; - ULONG ref = InterlockedIncrement(&(This->ref)); - TRACE("(%p) ref was %d\n", This, ref - 1); - return ref; -} - -static ULONG IDirectSoundImpl_Release( - LPDIRECTSOUND8 iface) +static void directsound_destroy(IDirectSoundImpl *This) { - IDirectSoundImpl *This = (IDirectSoundImpl *)iface; - ULONG ref = InterlockedDecrement(&(This->ref)); - TRACE("(%p) ref was %d\n", This, ref + 1); - - if (!ref) { - if (This->device) - DirectSoundDevice_Release(This->device); - HeapFree(GetProcessHeap(),0,This); - TRACE("(%p) released\n", This); - } - return ref; + if (This->device) + DirectSoundDevice_Release(This->device); + HeapFree(GetProcessHeap(),0,This); + TRACE("(%p) released\n", This); } static HRESULT IDirectSoundImpl_Create(IDirectSound8 **ppDS, BOOL has_ds8) @@ -255,7 +237,7 @@ static HRESULT IDirectSoundImpl_Create(IDirectSound8 **ppDS, BOOL has_ds8) return DSERR_OUTOFMEMORY; } - pDS->ref = 0; + pDS->numIfaces = 0; pDS->device = NULL; pDS->has_ds8 = has_ds8; @@ -292,9 +274,9 @@ static ULONG WINAPI IDirectSound_IUnknown_Release( IDirectSound_IUnknown *This = (IDirectSound_IUnknown *)iface; ULONG ref = InterlockedDecrement(&(This->ref)); TRACE("(%p) ref was %d\n", This, ref + 1); - if (!ref) { + if (!ref && !InterlockedDecrement(&((IDirectSoundImpl *)This->pds)->numIfaces)) { ((IDirectSoundImpl*)This->pds)->pUnknown = NULL; - IDirectSoundImpl_Release(This->pds); + directsound_destroy((IDirectSoundImpl*)This->pds); HeapFree(GetProcessHeap(), 0, This); TRACE("(%p) released\n", This); } @@ -337,7 +319,7 @@ static HRESULT IDirectSound_IUnknown_Create( pdsunk->ref = 0; pdsunk->pds = pds; - IDirectSoundImpl_AddRef(pds); + InterlockedIncrement(&((IDirectSoundImpl *)pds)->numIfaces); *ppunk = (LPUNKNOWN)pdsunk; return DS_OK; @@ -371,9 +353,9 @@ static ULONG WINAPI IDirectSound_IDirectSound_Release( IDirectSound_IDirectSound *This = (IDirectSound_IDirectSound *)iface; ULONG ref = InterlockedDecrement(&(This->ref)); TRACE("(%p) ref was %d\n", This, ref + 1); - if (!ref) { + if (!ref && !InterlockedDecrement(&((IDirectSoundImpl *)This->pds)->numIfaces)) { ((IDirectSoundImpl*)This->pds)->pDS = NULL; - IDirectSoundImpl_Release(This->pds); + directsound_destroy((IDirectSoundImpl*)This->pds); HeapFree(GetProcessHeap(), 0, This); TRACE("(%p) released\n", This); } @@ -499,7 +481,7 @@ static HRESULT IDirectSound_IDirectSound_Create( pdsds->ref = 0; pdsds->pds = pds; - IDirectSoundImpl_AddRef(pds); + InterlockedIncrement(&((IDirectSoundImpl *)pds)->numIfaces); *ppds = (LPDIRECTSOUND)pdsds; return DS_OK; @@ -533,9 +515,9 @@ static ULONG WINAPI IDirectSound8_IDirectSound8_Release( IDirectSound8_IDirectSound8 *This = (IDirectSound8_IDirectSound8 *)iface; ULONG ref = InterlockedDecrement(&(This->ref)); TRACE("(%p) ref was %d\n", This, ref + 1); - if (!ref) { + if (!ref && !InterlockedDecrement(&((IDirectSoundImpl *)This->pds)->numIfaces)) { ((IDirectSoundImpl*)This->pds)->pDS8 = NULL; - IDirectSoundImpl_Release(This->pds); + directsound_destroy((IDirectSoundImpl*)This->pds); HeapFree(GetProcessHeap(), 0, This); TRACE("(%p) released\n", This); } @@ -671,7 +653,7 @@ static HRESULT IDirectSound8_IDirectSound8_Create( pdsds->ref = 0; pdsds->pds = pds; - IDirectSoundImpl_AddRef(pds); + InterlockedIncrement(&((IDirectSoundImpl *)pds)->numIfaces); *ppds = (LPDIRECTSOUND8)pdsds; return DS_OK;

1 0

Michael Stefaniuc : dsound: Cleanup IDirectSoundImpl_Create() and move it.
by Alexandre Julliard 19 Jul '12

19 Jul '12

Module: wine Branch: master Commit: 478191c0595457ab68ad08ae6ef16f2ac2f1a265 URL: http://source.winehq.org/git/wine.git/?a=commit;h=478191c0595457ab68ad08ae6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 19 01:53:31 2012 +0200 dsound: Cleanup IDirectSoundImpl_Create() and move it. --- dlls/dsound/dsound.c | 47 +++++++++++++++++++++-------------------------- 1 files changed, 21 insertions(+), 26 deletions(-) diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index e59f176..b8c3d8b 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -85,8 +85,6 @@ struct IDirectSoundImpl LPDIRECTSOUND8 pDS8; }; -static HRESULT IDirectSoundImpl_Create(IDirectSound8 **ppds, BOOL has_ds8); - static ULONG WINAPI IDirectSound_IUnknown_AddRef(LPUNKNOWN iface); static ULONG WINAPI IDirectSound_IDirectSound_AddRef(LPDIRECTSOUND iface); @@ -224,28 +222,6 @@ static void directsound_destroy(IDirectSoundImpl *This) TRACE("(%p) released\n", This); } -static HRESULT IDirectSoundImpl_Create(IDirectSound8 **ppDS, BOOL has_ds8) -{ - IDirectSoundImpl* pDS; - TRACE("(%p)\n",ppDS); - - /* Allocate memory */ - pDS = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(IDirectSoundImpl)); - if (pDS == NULL) { - WARN("out of memory\n"); - *ppDS = NULL; - return DSERR_OUTOFMEMORY; - } - - pDS->numIfaces = 0; - pDS->device = NULL; - pDS->has_ds8 = has_ds8; - - *ppDS = (LPDIRECTSOUND8)pDS; - - return DS_OK; -} - /******************************************************************************* * IDirectSound_IUnknown */ @@ -659,6 +635,25 @@ static HRESULT IDirectSound8_IDirectSound8_Create( return DS_OK; } +static HRESULT IDirectSoundImpl_Create(void **ppv, BOOL has_ds8) +{ + IDirectSoundImpl *obj; + + *ppv = NULL; + obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*obj)); + if (!obj) { + WARN("out of memory\n"); + return DSERR_OUTOFMEMORY; + } + + obj->numIfaces = 0; + obj->device = NULL; + obj->has_ds8 = has_ds8; + + *ppv = obj; + return DS_OK; +} + HRESULT DSOUND_Create( REFIID riid, LPDIRECTSOUND *ppDS) @@ -676,7 +671,7 @@ HRESULT DSOUND_Create( /* Get dsound configuration */ setup_dsound_options(); - hr = IDirectSoundImpl_Create(&pDS, FALSE); + hr = IDirectSoundImpl_Create((void **)&pDS, FALSE); if (hr == DS_OK) { hr = IDirectSound_IDirectSound_Create(pDS, ppDS); if (*ppDS) @@ -764,7 +759,7 @@ HRESULT DSOUND_Create8( /* Get dsound configuration */ setup_dsound_options(); - hr = IDirectSoundImpl_Create(&pDS, TRUE); + hr = IDirectSoundImpl_Create((void **)&pDS, TRUE); if (hr == DS_OK) { hr = IDirectSound8_IDirectSound8_Create(pDS, ppDS); if (*ppDS)

1 0