September 2013 - Wine-Commits

Henri Verbeet : wined3d: Enforce WINED3DUSAGE_RENDERTARGET format restrictions on resource creation .
by Alexandre Julliard Sept. 5, 2013

Sept. 5, 2013

Module: wine Branch: master Commit: b28e9f6482bc7baca684d74c9f23bf56d2c6b8e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b28e9f6482bc7baca684d74c9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 5 09:54:40 2013 +0200 wined3d: Enforce WINED3DUSAGE_RENDERTARGET format restrictions on resource creation. --- dlls/wined3d/resource.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index ca322b2..6138764 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -85,6 +85,13 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * { const struct wined3d *d3d = device->wined3d; + resource_check_usage(usage); + if (pool != WINED3D_POOL_SCRATCH) + { + if ((usage & WINED3DUSAGE_RENDERTARGET) && !(format->flags & WINED3DFMT_FLAG_RENDERTARGET)) + return WINED3DERR_INVALIDCALL; + } + resource->ref = 1; resource->device = device; resource->type = type; @@ -106,8 +113,6 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * resource->resource_ops = resource_ops; list_init(&resource->privateData); - resource_check_usage(usage); - if (size) { resource->heap_memory = wined3d_resource_allocate_sysmem(size);

1 0

Henri Verbeet : ddraw: Don' t imply WINED3DUSAGE_RENDERTARGET on primary surfaces.
by Alexandre Julliard Sept. 5, 2013

Sept. 5, 2013

Module: wine Branch: master Commit: 6f321ff2f97a4eb1e613022342399c3ffc41bc89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f321ff2f97a4eb1e61302234… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 5 09:54:39 2013 +0200 ddraw: Don't imply WINED3DUSAGE_RENDERTARGET on primary surfaces. If the application actually wants to do 3D rendering on the primary surface, it should set DDSCAPS_3DDEVICE as well. --- dlls/ddraw/surface.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 4108fcd..6435774 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5716,10 +5716,7 @@ HRESULT ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, } if (desc->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) - { - usage |= WINED3DUSAGE_RENDERTARGET; desc->ddsCaps.dwCaps |= DDSCAPS_VISIBLE; - } if ((desc->ddsCaps.dwCaps & DDSCAPS_3DDEVICE) && !(desc->ddsCaps.dwCaps & DDSCAPS_ZBUFFER)) {

1 0

Michael Stefaniuc : dplayx: Simplify the creation of an IDirectPlaySPImpl object.
by Alexandre Julliard Sept. 5, 2013

Sept. 5, 2013

Module: wine Branch: master Commit: b80ab3357168123c3cfb35082159c491973f1474 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b80ab3357168123c3cfb35082… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Sep 5 00:01:20 2013 +0200 dplayx: Simplify the creation of an IDirectPlaySPImpl object. --- dlls/dplayx/dplay.c | 4 +-- dlls/dplayx/dplay_global.h | 2 +- dlls/dplayx/dplaysp.c | 55 ++++++++++++++++--------------------------- 3 files changed, 23 insertions(+), 38 deletions(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index 94ba844..20899d5 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -173,9 +173,7 @@ static BOOL DP_CreateDirectPlay2( LPVOID lpDP ) This->dp2->spData.lpCB->dwVersion = DPSP_MAJORVERSION; /* This is the pointer to the service provider */ - if( FAILED( DPSP_CreateInterface( &IID_IDirectPlaySP, - (LPVOID*)&This->dp2->spData.lpISP, This ) ) - ) + if ( FAILED( dplaysp_create( &IID_IDirectPlaySP, (void**)&This->dp2->spData.lpISP, This ) ) ) { /* FIXME: Memory leak */ return FALSE; diff --git a/dlls/dplayx/dplay_global.h b/dlls/dplayx/dplay_global.h index dca6396..7def46b 100644 --- a/dlls/dplayx/dplay_global.h +++ b/dlls/dplayx/dplay_global.h @@ -208,7 +208,7 @@ extern LPVOID DPSP_CreateSPPlayerData(void) DECLSPEC_HIDDEN; extern HRESULT dplay_create( REFIID riid, void **ppv ) DECLSPEC_HIDDEN; extern HRESULT dplobby_create( REFIID riid, void **ppv ) DECLSPEC_HIDDEN; -extern HRESULT DPSP_CreateInterface( REFIID riid, void **ppvObj, IDirectPlayImpl *dp ) DECLSPEC_HIDDEN; +extern HRESULT dplaysp_create( REFIID riid, void **ppv, IDirectPlayImpl *dp ) DECLSPEC_HIDDEN; extern HRESULT dplobbysp_create( REFIID riid, void **ppv, IDirectPlayImpl *dp ) DECLSPEC_HIDDEN; #endif /* __WINE_DPLAY_GLOBAL_INCLUDED */ diff --git a/dlls/dplayx/dplaysp.c b/dlls/dplayx/dplaysp.c index e8269df..25cb7c4 100644 --- a/dlls/dplayx/dplaysp.c +++ b/dlls/dplayx/dplaysp.c @@ -44,9 +44,6 @@ typedef struct IDirectPlaySPImpl IDirectPlayImpl *dplay; /* FIXME: This should perhaps be iface not impl */ } IDirectPlaySPImpl; -/* Forward declaration of virtual tables */ -static const IDirectPlaySPVtbl directPlaySPVT; - /* This structure is passed to the DP object for safe keeping */ typedef struct tagDP_SPPLAYERDATA { @@ -57,37 +54,6 @@ typedef struct tagDP_SPPLAYERDATA DWORD dwPlayerRemoteDataSize; } DP_SPPLAYERDATA, *LPDP_SPPLAYERDATA; -/* Create the SP interface */ -HRESULT DPSP_CreateInterface( REFIID riid, void **ppvObj, IDirectPlayImpl *dp ) -{ - TRACE( " for %s\n", debugstr_guid( riid ) ); - - *ppvObj = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof( IDirectPlaySPImpl ) ); - - if( *ppvObj == NULL ) - { - return DPERR_OUTOFMEMORY; - } - - if( IsEqualGUID( &IID_IDirectPlaySP, riid ) ) - { - IDirectPlaySPImpl *This = *ppvObj; - This->IDirectPlaySP_iface.lpVtbl = &directPlaySPVT; - This->dplay = dp; - } - else - { - /* Unsupported interface */ - HeapFree( GetProcessHeap(), 0, *ppvObj ); - *ppvObj = NULL; - - return E_NOINTERFACE; - } - - IDirectPlaySP_AddRef( (LPDIRECTPLAYSP)*ppvObj ); - return S_OK; -} static inline IDirectPlaySPImpl *impl_from_IDirectPlaySP( IDirectPlaySP *iface ) { @@ -717,6 +683,27 @@ static const IDirectPlaySPVtbl directPlaySPVT = IDirectPlaySPImpl_SendComplete }; +HRESULT dplaysp_create( REFIID riid, void **ppv, IDirectPlayImpl *dp ) +{ + IDirectPlaySPImpl *obj; + HRESULT hr; + + TRACE( "(%s, %p)\n", debugstr_guid( riid ), ppv ); + + *ppv = NULL; + obj = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof( *obj ) ); + if ( !obj ) + return DPERR_OUTOFMEMORY; + + obj->IDirectPlaySP_iface.lpVtbl = &directPlaySPVT; + obj->ref = 1; + obj->dplay = dp; + + hr = IDirectPlaySP_QueryInterface( &obj->IDirectPlaySP_iface, riid, ppv ); + IDirectPlaySP_Release( &obj->IDirectPlaySP_iface ); + + return hr; +} /* DP external interfaces to call into DPSP interface */

1 0

Michael Stefaniuc : dplayx: Remove the unused lock from IDirectPlaySPImpl.
by Alexandre Julliard Sept. 5, 2013

Sept. 5, 2013

Module: wine Branch: master Commit: 95fcb495032b9e3ab68a5b2ec1cd1f1ab2f953cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=95fcb495032b9e3ab68a5b2ec… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Sep 4 23:57:16 2013 +0200 dplayx: Remove the unused lock from IDirectPlaySPImpl. --- dlls/dplayx/dplaysp.c | 43 +------------------------------------------ 1 files changed, 1 insertions(+), 42 deletions(-) diff --git a/dlls/dplayx/dplaysp.c b/dlls/dplayx/dplaysp.c index 03169e3..e8fea40 100644 --- a/dlls/dplayx/dplaysp.c +++ b/dlls/dplayx/dplaysp.c @@ -34,19 +34,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(dplay); /* Prototypes */ -static BOOL DPSP_CreateIUnknown( LPVOID lpSP ); -static BOOL DPSP_DestroyIUnknown( LPVOID lpSP ); static BOOL DPSP_CreateDirectPlaySP( void *lpSP, IDirectPlayImpl *dp ); static BOOL DPSP_DestroyDirectPlaySP( LPVOID lpSP ); /* Predefine the interface */ typedef struct IDirectPlaySPImpl IDirectPlaySPImpl; -typedef struct tagDirectPlaySPIUnknownData -{ - CRITICAL_SECTION DPSP_lock; -} DirectPlaySPIUnknownData; - typedef struct tagDirectPlaySPData { LPVOID lpSpRemoteData; @@ -60,7 +53,6 @@ typedef struct tagDirectPlaySPData } DirectPlaySPData; #define DPSP_IMPL_FIELDS \ - DirectPlaySPIUnknownData* unk; \ DirectPlaySPData* sp; struct IDirectPlaySPImpl @@ -111,9 +103,7 @@ HRESULT DPSP_CreateInterface( REFIID riid, void **ppvObj, IDirectPlayImpl *dp ) } /* Initialize it */ - if( DPSP_CreateIUnknown( *ppvObj ) && - DPSP_CreateDirectPlaySP( *ppvObj, dp ) - ) + if( DPSP_CreateDirectPlaySP( *ppvObj, dp ) ) { IDirectPlaySP_AddRef( (LPDIRECTPLAYSP)*ppvObj ); return S_OK; @@ -121,7 +111,6 @@ HRESULT DPSP_CreateInterface( REFIID riid, void **ppvObj, IDirectPlayImpl *dp ) /* Initialize failed, destroy it */ DPSP_DestroyDirectPlaySP( *ppvObj ); - DPSP_DestroyIUnknown( *ppvObj ); HeapFree( GetProcessHeap(), 0, *ppvObj ); *ppvObj = NULL; @@ -129,35 +118,6 @@ HRESULT DPSP_CreateInterface( REFIID riid, void **ppvObj, IDirectPlayImpl *dp ) return DPERR_NOMEMORY; } -static BOOL DPSP_CreateIUnknown( LPVOID lpSP ) -{ - IDirectPlaySPImpl *This = lpSP; - - This->unk = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof( *(This->unk) ) ); - - if ( This->unk == NULL ) - { - return FALSE; - } - - InitializeCriticalSection( &This->unk->DPSP_lock ); - This->unk->DPSP_lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": IDirectPlaySPImpl*->DirectPlaySPIUnknownData*->DPSP_lock"); - - return TRUE; -} - -static BOOL DPSP_DestroyIUnknown( LPVOID lpSP ) -{ - IDirectPlaySPImpl *This = lpSP; - - This->unk->DPSP_lock.DebugInfo->Spare[0] = 0; - DeleteCriticalSection( &This->unk->DPSP_lock ); - HeapFree( GetProcessHeap(), 0, This->unk ); - - return TRUE; -} - - static BOOL DPSP_CreateDirectPlaySP( void *lpSP, IDirectPlayImpl *dp ) { IDirectPlaySPImpl *This = lpSP; @@ -229,7 +189,6 @@ static ULONG WINAPI IDirectPlaySPImpl_Release( IDirectPlaySP *iface ) if( !ref ) { DPSP_DestroyDirectPlaySP( This ); - DPSP_DestroyIUnknown( This ); HeapFree( GetProcessHeap(), 0, This ); }

1 0

Michael Stefaniuc : dplayx: Remove commented out TRACEs that mimic +tid functionality.
by Alexandre Julliard Sept. 5, 2013

Sept. 5, 2013

Module: wine Branch: master Commit: 07e59757971841e5bf8848bfca94cbe0c535ae62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07e59757971841e5bf8848bfc… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Sep 4 23:54:27 2013 +0200 dplayx: Remove commented out TRACEs that mimic +tid functionality. --- dlls/dplayx/dplaysp.c | 12 +++--------- 1 files changed, 3 insertions(+), 9 deletions(-) diff --git a/dlls/dplayx/dplaysp.c b/dlls/dplayx/dplaysp.c index 52fe09f..03169e3 100644 --- a/dlls/dplayx/dplaysp.c +++ b/dlls/dplayx/dplaysp.c @@ -655,9 +655,7 @@ static HRESULT WINAPI IDirectPlaySPImpl_SetSPPlayerData( IDirectPlaySP *iface, D LPDP_SPPLAYERDATA lpPlayerEntry; LPVOID lpPlayerData; -/* TRACE( "Called on process 0x%08lx\n", GetCurrentProcessId() ); */ - TRACE( "(%p)->(0x%08x,%p,0x%08x,0x%08x)\n", - This, idPlayer, lpData, dwDataSize, dwFlags ); + TRACE( "(%p)->(0x%08x,%p,0x%08x,0x%08x)\n", This, idPlayer, lpData, dwDataSize, dwFlags ); hr = DP_GetSPPlayerData( This->sp->dplay, idPlayer, (LPVOID*)&lpPlayerEntry ); if( FAILED(hr) ) @@ -703,9 +701,7 @@ static HRESULT WINAPI IDirectPlaySPImpl_GetSPData( IDirectPlaySP *iface, void ** IDirectPlaySPImpl *This = impl_from_IDirectPlaySP( iface ); HRESULT hr = DP_OK; -/* TRACE( "Called on process 0x%08lx\n", GetCurrentProcessId() ); */ - TRACE( "(%p)->(%p,%p,0x%08x)\n", - This, lplpData, lpdwDataSize, dwFlags ); + TRACE( "(%p)->(%p,%p,0x%08x)\n", This, lplpData, lpdwDataSize, dwFlags ); #if 0 /* This is what the documentation says... */ @@ -757,9 +753,7 @@ static HRESULT WINAPI IDirectPlaySPImpl_SetSPData( IDirectPlaySP *iface, void *l IDirectPlaySPImpl *This = impl_from_IDirectPlaySP( iface ); LPVOID lpSpData; -/* TRACE( "Called on process 0x%08lx\n", GetCurrentProcessId() ); */ - TRACE( "(%p)->(%p,0x%08x,0x%08x)\n", - This, lpData, dwDataSize, dwFlags ); + TRACE( "(%p)->(%p,0x%08x,0x%08x)\n", This, lpData, dwDataSize, dwFlags ); #if 0 /* This is what the documentation says... */

1 0

Jacek Caban : cryptnet: Removed unused typedefs.
by Alexandre Julliard Sept. 5, 2013

Sept. 5, 2013

Module: wine Branch: master Commit: 533730de7f0f09eee7179b78166857367cf2fb95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=533730de7f0f09eee7179b781… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 5 12:19:13 2013 +0200 cryptnet: Removed unused typedefs. --- dlls/cryptnet/cryptnet_main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index da66e66..35d6609 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -1812,14 +1812,14 @@ typedef struct _CERT_REVOCATION_PARA_NO_EXTRA_FIELDS { HCERTSTORE *rgCertStore; HCERTSTORE hCrlStore; LPFILETIME pftTimeToUse; -} CERT_REVOCATION_PARA_NO_EXTRA_FIELDS, *PCERT_REVOCATION_PARA_NO_EXTRA_FIELDS; +} CERT_REVOCATION_PARA_NO_EXTRA_FIELDS; typedef struct _OLD_CERT_REVOCATION_STATUS { DWORD cbSize; DWORD dwIndex; DWORD dwError; DWORD dwReason; -} OLD_CERT_REVOCATION_STATUS, *POLD_CERT_REVOCATION_STATUS; +} OLD_CERT_REVOCATION_STATUS; /*********************************************************************** * CertDllVerifyRevocation (CRYPTNET.@)

1 0

Michael Stefaniuc : dplayx: Finish the COM cleanup for IDirectPlaySP.
by Alexandre Julliard Sept. 5, 2013

Sept. 5, 2013

Module: wine Branch: master Commit: a3ba1b8ff0d986f755c9cb679fe3706dc1ac2f3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3ba1b8ff0d986f755c9cb679… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Sep 5 00:00:03 2013 +0200 dplayx: Finish the COM cleanup for IDirectPlaySP. --- dlls/dplayx/dplaysp.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dplayx/dplaysp.c b/dlls/dplayx/dplaysp.c index 780834c..e8269df 100644 --- a/dlls/dplayx/dplaysp.c +++ b/dlls/dplayx/dplaysp.c @@ -35,7 +35,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dplay); typedef struct IDirectPlaySPImpl { - const IDirectPlaySPVtbl *lpVtbl; + IDirectPlaySP IDirectPlaySP_iface; LONG ref; void *remote_data; DWORD remote_data_size; @@ -73,7 +73,7 @@ HRESULT DPSP_CreateInterface( REFIID riid, void **ppvObj, IDirectPlayImpl *dp ) if( IsEqualGUID( &IID_IDirectPlaySP, riid ) ) { IDirectPlaySPImpl *This = *ppvObj; - This->lpVtbl = &directPlaySPVT; + This->IDirectPlaySP_iface.lpVtbl = &directPlaySPVT; This->dplay = dp; } else @@ -91,7 +91,7 @@ HRESULT DPSP_CreateInterface( REFIID riid, void **ppvObj, IDirectPlayImpl *dp ) static inline IDirectPlaySPImpl *impl_from_IDirectPlaySP( IDirectPlaySP *iface ) { - return CONTAINING_RECORD( iface, IDirectPlaySPImpl, lpVtbl ); + return CONTAINING_RECORD( iface, IDirectPlaySPImpl, IDirectPlaySP_iface ); } static HRESULT WINAPI IDirectPlaySPImpl_QueryInterface( IDirectPlaySP *iface, REFIID riid,

1 0

Michael Stefaniuc : dplayx: Simplify ref-counting for IDirectPlaySP.
by Alexandre Julliard Sept. 5, 2013

Sept. 5, 2013

Module: wine Branch: master Commit: 744f94be4abcbf65627d45b57746a80c8e6799e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=744f94be4abcbf65627d45b57… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Sep 4 23:50:58 2013 +0200 dplayx: Simplify ref-counting for IDirectPlaySP. --- dlls/dplayx/dplaysp.c | 71 +++++++++++++----------------------------------- 1 files changed, 19 insertions(+), 52 deletions(-) diff --git a/dlls/dplayx/dplaysp.c b/dlls/dplayx/dplaysp.c index aac2811..52fe09f 100644 --- a/dlls/dplayx/dplaysp.c +++ b/dlls/dplayx/dplaysp.c @@ -44,7 +44,6 @@ typedef struct IDirectPlaySPImpl IDirectPlaySPImpl; typedef struct tagDirectPlaySPIUnknownData { - LONG ulObjRef; CRITICAL_SECTION DPSP_lock; } DirectPlaySPIUnknownData; @@ -61,13 +60,13 @@ typedef struct tagDirectPlaySPData } DirectPlaySPData; #define DPSP_IMPL_FIELDS \ - LONG ulInterfaceRef; \ DirectPlaySPIUnknownData* unk; \ DirectPlaySPData* sp; struct IDirectPlaySPImpl { const IDirectPlaySPVtbl *lpVtbl; + LONG ref; DPSP_IMPL_FIELDS }; @@ -194,79 +193,47 @@ static inline IDirectPlaySPImpl *impl_from_IDirectPlaySP( IDirectPlaySP *iface ) } static HRESULT WINAPI IDirectPlaySPImpl_QueryInterface( IDirectPlaySP *iface, REFIID riid, - void **ppvObj ) + void **ppv ) { - IDirectPlaySPImpl *This = (IDirectPlaySPImpl *)iface; - TRACE("(%p)->(%s,%p)\n", This, debugstr_guid( riid ), ppvObj ); + TRACE("(%p)->(%s,%p)\n", iface, debugstr_guid( riid ), ppv ); - *ppvObj = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof( *This ) ); - - if( *ppvObj == NULL ) - { - return DPERR_OUTOFMEMORY; - } - - CopyMemory( *ppvObj, This, sizeof( *This ) ); - (*(IDirectPlaySPImpl**)ppvObj)->ulInterfaceRef = 0; - - if( IsEqualGUID( &IID_IDirectPlaySP, riid ) ) - { - IDirectPlaySPImpl *This = *ppvObj; - This->lpVtbl = &directPlaySPVT; - } - else + if ( IsEqualGUID( &IID_IUnknown, riid ) || IsEqualGUID( &IID_IDirectPlaySP, riid ) ) { - /* Unsupported interface */ - HeapFree( GetProcessHeap(), 0, *ppvObj ); - *ppvObj = NULL; - - return E_NOINTERFACE; + *ppv = iface; + IDirectPlaySP_AddRef( iface ); + return S_OK; } - IDirectPlaySP_AddRef( (LPDIRECTPLAYSP)*ppvObj ); - - return S_OK; + FIXME( "Unsupported interface %s\n", debugstr_guid( riid ) ); + *ppv = NULL; + return E_NOINTERFACE; } static ULONG WINAPI IDirectPlaySPImpl_AddRef( IDirectPlaySP *iface ) { IDirectPlaySPImpl *This = impl_from_IDirectPlaySP( iface ); - ULONG ulInterfaceRefCount, ulObjRefCount; - - ulObjRefCount = InterlockedIncrement( &This->unk->ulObjRef ); - ulInterfaceRefCount = InterlockedIncrement( &This->ulInterfaceRef ); + ULONG ref = InterlockedIncrement( &This->ref ); - TRACE( "ref count incremented to %u:%u for %p\n", - ulInterfaceRefCount, ulObjRefCount, This ); + TRACE( "(%p) ref=%d\n", This, ref ); - return ulObjRefCount; + return ref; } static ULONG WINAPI IDirectPlaySPImpl_Release( IDirectPlaySP *iface ) { IDirectPlaySPImpl *This = impl_from_IDirectPlaySP( iface ); - ULONG ulInterfaceRefCount, ulObjRefCount; - - ulObjRefCount = InterlockedDecrement( &This->unk->ulObjRef ); - ulInterfaceRefCount = InterlockedDecrement( &This->ulInterfaceRef ); + ULONG ref = InterlockedDecrement( &This->ref ); - TRACE( "ref count decremented to %u:%u for %p\n", - ulInterfaceRefCount, ulObjRefCount, This ); - - /* Deallocate if this is the last reference to the object */ - if( ulObjRefCount == 0 ) - { - DPSP_DestroyDirectPlaySP( This ); - DPSP_DestroyIUnknown( This ); - } + TRACE( "(%p) ref=%d\n", This, ref ); - if( ulInterfaceRefCount == 0 ) + if( !ref ) { + DPSP_DestroyDirectPlaySP( This ); + DPSP_DestroyIUnknown( This ); HeapFree( GetProcessHeap(), 0, This ); } - return ulInterfaceRefCount; + return ref; } static HRESULT WINAPI IDirectPlaySPImpl_AddMRUEntry( IDirectPlaySP *iface, LPCWSTR lpSection,

1 0

Bruno Jesus : ws2_32: Cope with invalid protocols in WSAEnumProtocols.
by Alexandre Julliard Sept. 5, 2013

Sept. 5, 2013

Module: wine Branch: master Commit: 1d1faa0283727ddec8855ee877bf7033b9869d37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d1faa0283727ddec8855ee87… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Sep 5 09:56:19 2013 -0300 ws2_32: Cope with invalid protocols in WSAEnumProtocols. --- dlls/ws2_32/socket.c | 45 +++++++++++++++++++++-------- dlls/ws2_32/tests/protocol.c | 64 ++++++++++++++++++++++++++++++++++++++---- 2 files changed, 91 insertions(+), 18 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 1c72ce5..a916772 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -191,6 +191,16 @@ static const GUID ProviderIdIPX = { 0x11058240, 0xbe47, 0x11cf, static const GUID ProviderIdSPX = { 0x11058241, 0xbe47, 0x11cf, { 0x95, 0xc8, 0x00, 0x80, 0x5f, 0x48, 0xa1, 0x92 } }; +static const INT valid_protocols[] = +{ + WS_IPPROTO_TCP, + WS_IPPROTO_UDP, + NSPROTO_IPX, + NSPROTO_SPX, + NSPROTO_SPXII, + 0 +}; + #if defined(IP_UNICAST_IF) && defined(SO_ATTACH_FILTER) # define LINUX_BOUND_IF struct interface_filter { @@ -1259,6 +1269,14 @@ static inline BOOL supported_pf(int pf) } } +static inline BOOL supported_protocol(int protocol) +{ + int i; + for (i = 0; i < sizeof(valid_protocols) / sizeof(valid_protocols[0]); i++) + if (protocol == valid_protocols[i]) + return TRUE; + return FALSE; +} /**********************************************************************/ @@ -1665,11 +1683,10 @@ static INT WS_EnterSingleProtocolA( INT protocol, WSAPROTOCOL_INFOA* info ) return ret; } -static INT WS_EnumProtocols( BOOL unicode, LPINT protocols, LPWSAPROTOCOL_INFOW buffer, LPDWORD len ) +static INT WS_EnumProtocols( BOOL unicode, const INT *protocols, LPWSAPROTOCOL_INFOW buffer, LPDWORD len ) { - INT i = 0; + INT i = 0, items = 0; DWORD size = 0; - INT local[] = { WS_IPPROTO_TCP, WS_IPPROTO_UDP, NSPROTO_IPX, NSPROTO_SPX, NSPROTO_SPXII, 0 }; union _info { LPWSAPROTOCOL_INFOA a; @@ -1677,11 +1694,15 @@ static INT WS_EnumProtocols( BOOL unicode, LPINT protocols, LPWSAPROTOCOL_INFOW } info; info.w = buffer; - if (!protocols) protocols = local; + if (!protocols) protocols = valid_protocols; - while (protocols[i]) i++; + while (protocols[i]) + { + if(supported_protocol(protocols[i++])) + items++; + } - size = i * (unicode ? sizeof(WSAPROTOCOL_INFOW) : sizeof(WSAPROTOCOL_INFOA)); + size = items * (unicode ? sizeof(WSAPROTOCOL_INFOW) : sizeof(WSAPROTOCOL_INFOA)); if (*len < size || !buffer) { @@ -1690,20 +1711,20 @@ static INT WS_EnumProtocols( BOOL unicode, LPINT protocols, LPWSAPROTOCOL_INFOW return SOCKET_ERROR; } - for (i = 0; protocols[i]; i++) + for (i = items = 0; protocols[i]; i++) { if (unicode) { - if (WS_EnterSingleProtocolW( protocols[i], &info.w[i] ) == SOCKET_ERROR) - break; + if (WS_EnterSingleProtocolW( protocols[i], &info.w[items] ) != SOCKET_ERROR) + items++; } else { - if (WS_EnterSingleProtocolA( protocols[i], &info.a[i] ) == SOCKET_ERROR) - break; + if (WS_EnterSingleProtocolA( protocols[i], &info.a[items] ) != SOCKET_ERROR) + items++; } } - return i; + return items; } /************************************************************************** diff --git a/dlls/ws2_32/tests/protocol.c b/dlls/ws2_32/tests/protocol.c index 2b95381..1b9a429 100644 --- a/dlls/ws2_32/tests/protocol.c +++ b/dlls/ws2_32/tests/protocol.c @@ -60,9 +60,10 @@ static void test_service_flags(int family, int version, int socktype, int protoc static void test_WSAEnumProtocolsA(void) { - INT ret; + INT ret, i, j, found; DWORD len = 0, error; WSAPROTOCOL_INFOA info, *buffer; + INT ptest[] = {0xdead, IPPROTO_TCP, 0xcafe, IPPROTO_UDP, 0xbeef, 0}; ret = WSAEnumProtocolsA( NULL, NULL, &len ); ok( ret == SOCKET_ERROR, "WSAEnumProtocolsA() succeeded unexpectedly\n"); @@ -80,8 +81,6 @@ static void test_WSAEnumProtocolsA(void) if (buffer) { - INT i; - ret = WSAEnumProtocolsA( NULL, buffer, &len ); ok( ret != SOCKET_ERROR, "WSAEnumProtocolsA() failed unexpectedly: %d\n", WSAGetLastError() ); @@ -96,13 +95,41 @@ static void test_WSAEnumProtocolsA(void) HeapFree( GetProcessHeap(), 0, buffer ); } + + /* Test invalid protocols in the list */ + ret = WSAEnumProtocolsA( ptest, NULL, &len ); + ok( ret == SOCKET_ERROR, "WSAEnumProtocolsA() succeeded unexpectedly\n"); + error = WSAGetLastError(); + ok( error == WSAENOBUFS, "Expected 10055, received %d\n", error); + + buffer = HeapAlloc( GetProcessHeap(), 0, len ); + + if (buffer) + { + ret = WSAEnumProtocolsA( ptest, buffer, &len ); + ok( ret != SOCKET_ERROR, "WSAEnumProtocolsA() failed unexpectedly: %d\n", + WSAGetLastError() ); + ok( ret >= 2, "Expected at least 2 items, received %d\n", ret); + + for (i = found = 0; i < ret; i++) + for (j = 0; j < sizeof(ptest) / sizeof(ptest[0]); j++) + if (buffer[i].iProtocol == ptest[j]) + { + found |= 1 << j; + break; + } + ok(found == 0x0A, "Expected 2 bits represented as 0xA, received 0x%x\n", found); + + HeapFree( GetProcessHeap(), 0, buffer ); + } } static void test_WSAEnumProtocolsW(void) { - INT ret; + INT ret, i, j, found; DWORD len = 0, error; WSAPROTOCOL_INFOW info, *buffer; + INT ptest[] = {0xdead, IPPROTO_TCP, 0xcafe, IPPROTO_UDP, 0xbeef, 0}; ret = WSAEnumProtocolsW( NULL, NULL, &len ); ok( ret == SOCKET_ERROR, "WSAEnumProtocolsW() succeeded unexpectedly\n"); @@ -120,8 +147,6 @@ static void test_WSAEnumProtocolsW(void) if (buffer) { - INT i; - ret = WSAEnumProtocolsW( NULL, buffer, &len ); ok( ret != SOCKET_ERROR, "WSAEnumProtocolsW() failed unexpectedly: %d\n", WSAGetLastError() ); @@ -136,6 +161,33 @@ static void test_WSAEnumProtocolsW(void) HeapFree( GetProcessHeap(), 0, buffer ); } + + /* Test invalid protocols in the list */ + ret = WSAEnumProtocolsW( ptest, NULL, &len ); + ok( ret == SOCKET_ERROR, "WSAEnumProtocolsW() succeeded unexpectedly\n"); + error = WSAGetLastError(); + ok( error == WSAENOBUFS, "Expected 10055, received %d\n", error); + + buffer = HeapAlloc( GetProcessHeap(), 0, len ); + + if (buffer) + { + ret = WSAEnumProtocolsW( ptest, buffer, &len ); + ok( ret != SOCKET_ERROR, "WSAEnumProtocolsW() failed unexpectedly: %d\n", + WSAGetLastError() ); + ok( ret >= 2, "Expected at least 2 items, received %d\n", ret); + + for (i = found = 0; i < ret; i++) + for (j = 0; j < sizeof(ptest) / sizeof(ptest[0]); j++) + if (buffer[i].iProtocol == ptest[j]) + { + found |= 1 << j; + break; + } + ok(found == 0x0A, "Expected 2 bits represented as 0xA, received 0x%x\n", found); + + HeapFree( GetProcessHeap(), 0, buffer ); + } } START_TEST( protocol )

1 0

Jactry Zeng : riched20/tests: Add tests of ITextDocument_Open.
by Alexandre Julliard Sept. 5, 2013

Sept. 5, 2013

Module: wine Branch: master Commit: a8d87afe1ca9754190326503ce94ef2cdd41a2df URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8d87afe1ca9754190326503c… Author: Jactry Zeng <jactry92(a)gmail.com> Date: Wed Sep 4 19:04:19 2013 +0800 riched20/tests: Add tests of ITextDocument_Open. --- dlls/riched20/tests/richole.c | 247 +++++++++++++++++++++++++++++++++++++++-- 1 files changed, 237 insertions(+), 10 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a8d87afe1ca9754190326…

1 0