April 2013 - Wine-Commits - list.winehq.org

Michael Stefaniuc : dplayx: IDirectPlay4 / IDirectPlay4A have independent refcounts.
by Alexandre Julliard April 2, 2013

April 2, 2013

Module: wine Branch: master Commit: 719b5d931cae73042cc38621713e5653f307e964 URL: http://source.winehq.org/git/wine.git/?a=commit;h=719b5d931cae73042cc386217… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 29 16:49:30 2013 +0100 dplayx: IDirectPlay4 / IDirectPlay4A have independent refcounts. --- dlls/dplayx/dplay.c | 77 ++++++++++++++++++++++++-------------------- dlls/dplayx/dplay_global.h | 3 +- dlls/dplayx/tests/dplayx.c | 2 +- 3 files changed, 45 insertions(+), 37 deletions(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index 93862a3..b3bb7c6 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -355,6 +355,13 @@ static BOOL DP_DestroyDirectPlay2( LPVOID lpDP ) return TRUE; } +static void dplay_destroy(IDirectPlayImpl *obj) +{ + DP_DestroyDirectPlay2( obj ); + obj->lock.DebugInfo->Spare[0] = 0; + DeleteCriticalSection( &obj->lock ); + HeapFree( GetProcessHeap(), 0, obj ); +} /* Direct Play methods */ @@ -381,36 +388,6 @@ static HRESULT WINAPI DP_QueryInterface( IDirectPlayImpl *This, REFIID riid, voi return S_OK; } -/* Shared between all dplay types */ -static ULONG WINAPI DP_AddRef( IDirectPlayImpl *This ) -{ - ULONG ulInterfaceRefCount = InterlockedIncrement( &This->ulInterfaceRef ); - - TRACE( "ref count incremented to %u for %p\n", ulInterfaceRefCount, This ); - - return ulInterfaceRefCount; -} - -static ULONG WINAPI DP_Release( IDirectPlayImpl *This ) -{ - ULONG ulInterfaceRefCount = InterlockedDecrement( &This->ulInterfaceRef ); - - TRACE( "ref count decremented to %u for %p\n", ulInterfaceRefCount, This ); - - /* Deallocate if this is the last reference to the object */ - if( ulInterfaceRefCount == 0 ) - { - /* If we're destroying the object, this must be the last ref - of the last interface */ - DP_DestroyDirectPlay2( This ); - This->lock.DebugInfo->Spare[0] = 0; - DeleteCriticalSection( &This->lock ); - HeapFree( GetProcessHeap(), 0, This ); - } - - return ulInterfaceRefCount; -} - static inline DPID DP_NextObjectId(void) { return (DPID)InterlockedIncrement( &kludgePlayerGroupId ); @@ -610,25 +587,53 @@ static HRESULT WINAPI IDirectPlay4Impl_QueryInterface( IDirectPlay4 *iface, REFI static ULONG WINAPI IDirectPlay4AImpl_AddRef(IDirectPlay4A *iface) { IDirectPlayImpl *This = impl_from_IDirectPlay4A( iface ); - return DP_AddRef( This ); + ULONG ref = InterlockedIncrement( &This->ref4A ); + + TRACE( "(%p) ref4A=%d\n", This, ref ); + + if ( ref == 1 ) + InterlockedIncrement( &This->numIfaces ); + + return ref; } static ULONG WINAPI IDirectPlay4Impl_AddRef(IDirectPlay4 *iface) { IDirectPlayImpl *This = impl_from_IDirectPlay4( iface ); - return DP_AddRef( This ); + ULONG ref = InterlockedIncrement( &This->ref4 ); + + TRACE( "(%p) ref4=%d\n", This, ref ); + + if ( ref == 1 ) + InterlockedIncrement( &This->numIfaces ); + + return ref; } static ULONG WINAPI IDirectPlay4AImpl_Release(IDirectPlay4A *iface) { IDirectPlayImpl *This = impl_from_IDirectPlay4A( iface ); - return DP_Release( This ); + ULONG ref = InterlockedDecrement( &This->ref4A ); + + TRACE( "(%p) ref4A=%d\n", This, ref ); + + if ( !ref && !InterlockedDecrement( &This->numIfaces ) ) + dplay_destroy( This ); + + return ref; } static ULONG WINAPI IDirectPlay4Impl_Release(IDirectPlay4 *iface) { IDirectPlayImpl *This = impl_from_IDirectPlay4( iface ); - return DP_Release( This ); + ULONG ref = InterlockedDecrement( &This->ref4 ); + + TRACE( "(%p) ref4=%d\n", This, ref ); + + if ( !ref && !InterlockedDecrement( &This->numIfaces ) ) + dplay_destroy( This ); + + return ref; } static HRESULT WINAPI IDirectPlay4AImpl_AddPlayerToGroup( IDirectPlay4A *iface, DPID idGroup, @@ -4700,7 +4705,9 @@ HRESULT dplay_create( REFIID riid, void **ppv ) obj->IDirectPlay4A_iface.lpVtbl = &dp4A_vt; obj->IDirectPlay4_iface.lpVtbl = &dp4_vt; - obj->ulInterfaceRef = 1; + obj->numIfaces = 1; + obj->ref4A = 1; + obj->ref4 = 0; InitializeCriticalSection( &obj->lock ); obj->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": IDirectPlayImpl.lock"); diff --git a/dlls/dplayx/dplay_global.h b/dlls/dplayx/dplay_global.h index 4684f53..18eb8077 100644 --- a/dlls/dplayx/dplay_global.h +++ b/dlls/dplayx/dplay_global.h @@ -184,7 +184,8 @@ typedef struct IDirectPlayImpl { IDirectPlay4A IDirectPlay4A_iface; IDirectPlay4 IDirectPlay4_iface; - LONG ulInterfaceRef; + LONG numIfaces; /* "in use interfaces" refcount */ + LONG ref4A, ref4; CRITICAL_SECTION lock; DirectPlay2Data *dp2; } IDirectPlayImpl; diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c index b7bbac3..840015d 100644 --- a/dlls/dplayx/tests/dplayx.c +++ b/dlls/dplayx/tests/dplayx.c @@ -6399,7 +6399,7 @@ static void test_COM(void) hr = IDirectPlayX_QueryInterface(dp4, &IID_IDirectPlay2A, (void**)&dp2A); ok(hr == S_OK, "QueryInterface for IID_IDirectPlay2A failed: %08x\n", hr); refcount = IDirectPlay2_AddRef(dp2A); - todo_wine ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + ok(refcount == 2, "refcount == %u, expected 2\n", refcount); IDirectPlay2_Release(dp2A); hr = IDirectPlayX_QueryInterface(dp4, &IID_IDirectPlay2, (void**)&dp2);

1 0

Michael Stefaniuc : dplayx: Cleanup the DirectPlay object creation.
by Alexandre Julliard April 2, 2013

April 2, 2013

Module: wine Branch: master Commit: 4a9cd6307282a26f6a603074a8cc48ac206a159b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a9cd6307282a26f6a603074a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 29 16:48:57 2013 +0100 dplayx: Cleanup the DirectPlay object creation. --- dlls/dplayx/dpclassfactory.c | 2 +- dlls/dplayx/dpinit.h | 2 +- dlls/dplayx/dplay.c | 95 ++++++++++++++---------------------------- dlls/dplayx/dplobby.c | 3 +- 4 files changed, 35 insertions(+), 67 deletions(-) diff --git a/dlls/dplayx/dpclassfactory.c b/dlls/dplayx/dpclassfactory.c index 2502e1e..438ad60 100644 --- a/dlls/dplayx/dpclassfactory.c +++ b/dlls/dplayx/dpclassfactory.c @@ -101,7 +101,7 @@ static const IClassFactoryVtbl cf_vt = { IClassFactoryImpl_LockServer }; -static IClassFactoryImpl dplay_cf = {{&cf_vt}, DP_CreateInterface}; +static IClassFactoryImpl dplay_cf = {{&cf_vt}, dplay_create}; static IClassFactoryImpl dplaylobby_cf = {{&cf_vt}, DPL_CreateInterface}; diff --git a/dlls/dplayx/dpinit.h b/dlls/dplayx/dpinit.h index 361759b..090b67a 100644 --- a/dlls/dplayx/dpinit.h +++ b/dlls/dplayx/dpinit.h @@ -26,7 +26,7 @@ #include "wtypes.h" #include "dplay_global.h" -extern HRESULT DP_CreateInterface( REFIID riid, LPVOID* ppvObj ) DECLSPEC_HIDDEN; +extern HRESULT dplay_create( REFIID riid, void **ppv ) DECLSPEC_HIDDEN; extern HRESULT DPL_CreateInterface( REFIID riid, LPVOID* ppvObj ) DECLSPEC_HIDDEN; extern HRESULT DPSP_CreateInterface( REFIID riid, LPVOID* ppvObj, IDirectPlay2Impl* dp ) DECLSPEC_HIDDEN; diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index 9f766de..93862a3 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -76,10 +76,6 @@ static BOOL CALLBACK cbRemoveGroupOrPlayer( DPID dpId, DWORD dwPlayerType, LPVOID lpContext ); static void DP_DeleteGroup( IDirectPlay2Impl* This, DPID dpid ); -/* Forward declarations of virtual tables */ -static const IDirectPlay4Vtbl directPlay4AVT; -static const IDirectPlay4Vtbl directPlay4WVT; - /* Helper methods for player/group interfaces */ static HRESULT DP_IF_DeletePlayerFromGroup ( IDirectPlay2Impl* This, LPVOID lpMsgHdr, DPID idGroup, @@ -360,55 +356,6 @@ static BOOL DP_DestroyDirectPlay2( LPVOID lpDP ) } -/* Create a new interface */ -HRESULT DP_CreateInterface - ( REFIID riid, LPVOID* ppvObj ) -{ - IDirectPlayImpl *This; - - TRACE( " for %s\n", debugstr_guid( riid ) ); - - This = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof( IDirectPlayImpl ) ); - if( !This ) - return DPERR_OUTOFMEMORY; - - This->IDirectPlay4_iface.lpVtbl = &directPlay4WVT; - This->IDirectPlay4A_iface.lpVtbl = &directPlay4AVT; - - if( IsEqualGUID( &IID_IDirectPlay2, riid ) || IsEqualGUID( &IID_IDirectPlay3, riid ) || - IsEqualGUID( &IID_IDirectPlay4, riid ) ) - *ppvObj = &This->IDirectPlay4_iface; - else if( IsEqualGUID( &IID_IUnknown, riid ) || IsEqualGUID( &IID_IDirectPlay2A, riid ) || - IsEqualGUID( &IID_IDirectPlay3A, riid ) || IsEqualGUID( &IID_IDirectPlay4A, riid ) ) - *ppvObj = &This->IDirectPlay4A_iface; - else - { - /* Unsupported interface */ - HeapFree( GetProcessHeap(), 0, *ppvObj ); - *ppvObj = NULL; - - return E_NOINTERFACE; - } - - /* Initialize it */ - if ( DP_CreateDirectPlay2( This ) ) - { - InitializeCriticalSection( &This->lock ); - This->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": IDirectPlayImpl.lock"); - IDirectPlayX_AddRef( (LPDIRECTPLAY2A)*ppvObj ); - - return S_OK; - } - - /* Initialize failed, destroy it */ - DP_DestroyDirectPlay2( This ); - HeapFree( GetProcessHeap(), 0, This ); - - *ppvObj = NULL; - return DPERR_NOMEMORY; -} - - /* Direct Play methods */ /* Shared between all dplay types */ @@ -4619,12 +4566,8 @@ static HRESULT WINAPI DirectPlay4WImpl_CancelPriority } /* Note: Hack so we can reuse the old functions without compiler warnings */ -#if !defined(__STRICT_ANSI__) && defined(__GNUC__) -# define XCAST(fun) (typeof(directPlay4WVT.fun)) -#else # define XCAST(fun) (void*) -#endif -static const IDirectPlay4Vtbl directPlay4WVT = +static const IDirectPlay4Vtbl dp4_vt = { IDirectPlay4Impl_QueryInterface, IDirectPlay4Impl_AddRef, @@ -4685,7 +4628,7 @@ static const IDirectPlay4Vtbl directPlay4WVT = }; #undef XCAST -static const IDirectPlay4Vtbl directPlay4AVT = +static const IDirectPlay4Vtbl dp4A_vt = { IDirectPlay4AImpl_QueryInterface, IDirectPlay4AImpl_AddRef, @@ -4743,6 +4686,35 @@ static const IDirectPlay4Vtbl directPlay4AVT = DirectPlay4AImpl_CancelPriority }; +HRESULT dplay_create( REFIID riid, void **ppv ) +{ + IDirectPlayImpl *obj; + HRESULT hr; + + TRACE( "(%s, %p)\n", debugstr_guid( riid ), ppv ); + + *ppv = NULL; + obj = HeapAlloc( GetProcessHeap(), 0, sizeof( *obj ) ); + if ( !obj ) + return DPERR_OUTOFMEMORY; + + obj->IDirectPlay4A_iface.lpVtbl = &dp4A_vt; + obj->IDirectPlay4_iface.lpVtbl = &dp4_vt; + obj->ulInterfaceRef = 1; + + InitializeCriticalSection( &obj->lock ); + obj->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": IDirectPlayImpl.lock"); + + if ( DP_CreateDirectPlay2( obj ) ) + hr = IDirectPlayX_QueryInterface( &obj->IDirectPlay4A_iface, riid, ppv ); + else + hr = DPERR_NOMEMORY; + IDirectPlayX_Release( &obj->IDirectPlay4A_iface ); + + return hr; +} + + HRESULT DP_GetSPPlayerData( IDirectPlay2Impl* lpDP, DPID idPlayer, LPVOID* lplpData ) @@ -5016,13 +4988,10 @@ HRESULT WINAPI DirectPlayCreate return DPERR_INVALIDPARAMS; } - /* Create an IDirectPlay object. We don't support that so we'll cheat and give them an IDirectPlay2A object and hope that doesn't cause problems */ - if( DP_CreateInterface( &IID_IDirectPlay2A, (LPVOID*)lplpDP ) != DP_OK ) - { + if ( dplay_create( &IID_IDirectPlay2A, (void**)lplpDP ) != DP_OK ) return DPERR_UNAVAILABLE; - } if( IsEqualGUID( &GUID_NULL, lpGUID ) ) { diff --git a/dlls/dplayx/dplobby.c b/dlls/dplayx/dplobby.c index 9adc67a..204ff59 100644 --- a/dlls/dplayx/dplobby.c +++ b/dlls/dplayx/dplobby.c @@ -494,8 +494,7 @@ static HRESULT DPL_ConnectEx dwFlags = DPCONNECT_RETURNSTATUS; } - /* Create the DirectPlay interface */ - if( ( hr = DP_CreateInterface( riid, lplpDP ) ) != DP_OK ) + if ( ( hr = dplay_create( riid, lplpDP ) ) != DP_OK ) { ERR( "error creating interface for %s:%s.\n", debugstr_guid( riid ), DPLAYX_HresultToString( hr ) );

1 0

Michael Stefaniuc : dplayx: Merge the IDirectPlay4_InitializeConnection helper.
by Alexandre Julliard April 2, 2013

April 2, 2013

Module: wine Branch: master Commit: 03464daa3d8a66dfa8f3cae400dc8acdee4dfbd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03464daa3d8a66dfa8f3cae40… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 29 17:02:30 2013 +0100 dplayx: Merge the IDirectPlay4_InitializeConnection helper. --- dlls/dplayx/dplay.c | 144 +++++++++++++++++++------------------------------- 1 files changed, 55 insertions(+), 89 deletions(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index 6547b3c..ff4f469 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -140,8 +140,6 @@ static HRESULT DP_IF_EnumSessions ( IDirectPlay2Impl* This, LPDPSESSIONDESC2 lpsd, DWORD dwTimeout, LPDPENUMSESSIONSCALLBACK2 lpEnumSessionsCallback2, LPVOID lpContext, DWORD dwFlags, BOOL bAnsi ); -static HRESULT DP_IF_InitializeConnection - ( IDirectPlay3Impl* This, LPVOID lpConnection, DWORD dwFlags, BOOL bAnsi ); static BOOL CALLBACK cbDPCreateEnumConnections( LPCGUID lpguidSP, LPVOID lpConnection, DWORD dwConnectionSize, LPCDPNAME lpName, DWORD dwFlags, LPVOID lpContext ); @@ -1896,8 +1894,7 @@ static HRESULT DP_IF_EnumSessions return DPERR_GENERIC; } - hr = DP_IF_InitializeConnection( (IDirectPlay3Impl*)This, lpConnection, - 0, bAnsi ); + hr = IDirectPlayX_InitializeConnection( &This->IDirectPlay4_iface, lpConnection, 0 ); if( FAILED(hr) ) { return hr; @@ -3735,103 +3732,72 @@ HRESULT DP_InitializeDPLSP( IDirectPlay3Impl* This, HMODULE hLobbyProvider ) return hr; } -static HRESULT DP_IF_InitializeConnection - ( IDirectPlay3Impl* This, LPVOID lpConnection, DWORD dwFlags, BOOL bAnsi ) +static HRESULT WINAPI IDirectPlay4AImpl_InitializeConnection( IDirectPlay4A *iface, + void *connection, DWORD flags ) { - HMODULE hServiceProvider; - HRESULT hr; - GUID guidSP; - const DWORD dwAddrSize = 80; /* FIXME: Need to calculate it correctly */ - BOOL bIsDpSp; /* TRUE if Direct Play SP, FALSE if Direct Play Lobby SP */ - - TRACE("(%p)->(%p,0x%08x,%u)\n", This, lpConnection, dwFlags, bAnsi ); - - if ( lpConnection == NULL ) - { - return DPERR_INVALIDPARAMS; - } - - if( dwFlags != 0 ) - { - return DPERR_INVALIDFLAGS; - } - - if( This->dp2->connectionInitialized != NO_PROVIDER ) - { - return DPERR_ALREADYINITIALIZED; - } - - /* Find out what the requested SP is and how large this buffer is */ - hr = DPL_EnumAddress( DP_GetSpLpGuidFromCompoundAddress, lpConnection, - dwAddrSize, &guidSP ); - - if( FAILED(hr) ) - { - ERR( "Invalid compound address?\n" ); - return DPERR_UNAVAILABLE; - } - - /* Load the service provider */ - hServiceProvider = DP_LoadSP( &guidSP, &This->dp2->spData, &bIsDpSp ); + IDirectPlayImpl *This = impl_from_IDirectPlay4A( iface ); + return IDirectPlayX_InitializeConnection( &This->IDirectPlay4_iface, connection, flags ); +} - if( hServiceProvider == 0 ) - { - ERR( "Unable to load service provider %s\n", debugstr_guid(&guidSP) ); - return DPERR_UNAVAILABLE; - } +static HRESULT WINAPI IDirectPlay4Impl_InitializeConnection( IDirectPlay4 *iface, + void *connection, DWORD flags ) +{ + IDirectPlayImpl *This = impl_from_IDirectPlay4( iface ); + HMODULE servprov; + GUID sp; + const DWORD size = 80; /* FIXME: Need to calculate it correctly */ + BOOL is_dp_sp; /* TRUE if Direct Play SP, FALSE if Direct Play Lobby SP */ + HRESULT hr; - if( bIsDpSp ) - { - /* Fill in what we can of the Service Provider required information. - * The rest was be done in DP_LoadSP - */ - This->dp2->spData.lpAddress = lpConnection; - This->dp2->spData.dwAddressSize = dwAddrSize; - This->dp2->spData.lpGuid = &guidSP; + TRACE( "(%p)->(%p,0x%08x)\n", This, connection, flags ); - hr = DP_InitializeDPSP( This, hServiceProvider ); - } - else - { - This->dp2->dplspData.lpAddress = lpConnection; + if ( !connection ) + return DPERR_INVALIDPARAMS; - hr = DP_InitializeDPLSP( This, hServiceProvider ); - } + if ( flags ) + return DPERR_INVALIDFLAGS; - if( FAILED(hr) ) - { - return hr; - } + if ( This->dp2->connectionInitialized != NO_PROVIDER ) + return DPERR_ALREADYINITIALIZED; - return DP_OK; -} + /* Find out what the requested SP is and how large this buffer is */ + hr = DPL_EnumAddress( DP_GetSpLpGuidFromCompoundAddress, connection, size, &sp ); -static HRESULT WINAPI IDirectPlay4AImpl_InitializeConnection( IDirectPlay4A *iface, - void *lpConnection, DWORD dwFlags ) -{ - IDirectPlayImpl *This = impl_from_IDirectPlay4A( iface ); + if ( FAILED(hr) ) + { + ERR( "Invalid compound address?\n" ); + return DPERR_UNAVAILABLE; + } - /* This may not be externally invoked once either an SP or LP is initialized */ - if( This->dp2->connectionInitialized != NO_PROVIDER ) - { - return DPERR_ALREADYINITIALIZED; - } + /* Load the service provider */ + servprov = DP_LoadSP( &sp, &This->dp2->spData, &is_dp_sp ); - return DP_IF_InitializeConnection( This, lpConnection, dwFlags, TRUE ); -} + if ( !servprov ) + { + ERR( "Unable to load service provider %s\n", debugstr_guid(&sp) ); + return DPERR_UNAVAILABLE; + } -static HRESULT WINAPI DirectPlay3WImpl_InitializeConnection - ( LPDIRECTPLAY3 iface, LPVOID lpConnection, DWORD dwFlags ) -{ - IDirectPlay3Impl *This = (IDirectPlay3Impl *)iface; + if ( is_dp_sp ) + { + /* Fill in what we can of the Service Provider required information. + * The rest was be done in DP_LoadSP + */ + This->dp2->spData.lpAddress = connection; + This->dp2->spData.dwAddressSize = size; + This->dp2->spData.lpGuid = &sp; + hr = DP_InitializeDPSP( This, servprov ); + } + else + { + This->dp2->dplspData.lpAddress = connection; + hr = DP_InitializeDPLSP( This, servprov ); + } - /* This may not be externally invoked once either an SP or LP is initialized */ - if( This->dp2->connectionInitialized != NO_PROVIDER ) - { - return DPERR_ALREADYINITIALIZED; - } + if ( FAILED(hr) ) + return hr; - return DP_IF_InitializeConnection( This, lpConnection, dwFlags, FALSE ); + return DP_OK; } static HRESULT WINAPI IDirectPlay4AImpl_SecureOpen( IDirectPlay4A *iface, @@ -4365,7 +4331,7 @@ static const IDirectPlay4Vtbl dp4_vt = IDirectPlay4Impl_EnumConnections, IDirectPlay4Impl_EnumGroupsInGroup, IDirectPlay4Impl_GetGroupConnectionSettings, - XCAST(InitializeConnection)DirectPlay3WImpl_InitializeConnection, + IDirectPlay4Impl_InitializeConnection, XCAST(SecureOpen)DirectPlay3WImpl_SecureOpen, IDirectPlay4Impl_SendChatMessage, IDirectPlay4Impl_SetGroupConnectionSettings,

1 0

Michael Stefaniuc : dplayx: Merge the IDirectPlay4_EnumSessions helper.
by Alexandre Julliard April 2, 2013

April 2, 2013

Module: wine Branch: master Commit: 31065c62d4bcba500107a71d32bf13424f9f83d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31065c62d4bcba500107a71d3… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 29 17:04:20 2013 +0100 dplayx: Merge the IDirectPlay4_EnumSessions helper. --- dlls/dplayx/dplay.c | 276 +++++++++++++++++++++------------------------------ 1 files changed, 111 insertions(+), 165 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=31065c62d4bcba500107a…

1 0

Lucas Zawacki : Added Portuguese translation for release 1.5.27
by Jeremy Newman April 1, 2013

April 1, 2013

Module: website Branch: master Commit: 6b075fcdea37b1d2a996ca7c794061c25425fda2 URL: http://source.winehq.org/git/website.git/?a=commit;h=6b075fcdea37b1d2a996ca… Author: Lucas Zawacki <lfzawacki(a)gmail.com> Date: Mon Apr 1 18:10:18 2013 -0300 Added Portuguese translation for release 1.5.27 --- news/pt/2013032901.xml | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/news/pt/2013032901.xml b/news/pt/2013032901.xml new file mode 100644 index 0000000..9cc83dd --- /dev/null +++ b/news/pt/2013032901.xml @@ -0,0 +1,14 @@ +<news> +<date>29 de Março de 2013</date> +<title>Wine 1.5.27 lançado</title> +<body> + A versão de desenvolvimento 1.5.27 já está disponível agora. + <a href="{$root}/announce/1.5.27">Novidades</a> desta versão: +<ul> + <li>Suporte à bandeja do sistema no driver para Mac.</li> + <li>Várias melhorias no runtime C.</li> + <li>Ícones grandes para todas as aplicações embutidas.</li> + <li>Várias correções de bugs.</li> +O código fonte está <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.27.tar.bz2">disponível agora</a>. +Pacotes binários estão em processo de construção e irão aparecer em breve em suas respectivas <a href="{$root}/download">sessões da área de downloads</a>. +</body></news>

1 0

Andrew Cook : dbghelp: Add stubs for SymSetHomeDirectory.
by Alexandre Julliard April 1, 2013

April 1, 2013

Module: wine Branch: master Commit: 878ea7d9ea4bbb924a539ec2808867468d336675 URL: http://source.winehq.org/git/wine.git/?a=commit;h=878ea7d9ea4bbb924a539ec28… Author: Andrew Cook <ariscop(a)gmail.com> Date: Sat Mar 30 13:38:40 2013 +1100 dbghelp: Add stubs for SymSetHomeDirectory. --- dlls/dbghelp/dbghelp.spec | 4 ++-- dlls/dbghelp/symbol.c | 22 ++++++++++++++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/dbghelp.spec b/dlls/dbghelp/dbghelp.spec index 5b48ae5..4772358 100644 --- a/dlls/dbghelp/dbghelp.spec +++ b/dlls/dbghelp/dbghelp.spec @@ -153,8 +153,8 @@ @ stdcall SymSearch(long int64 long long str int64 ptr ptr long) @ stdcall SymSearchW(long int64 long long wstr int64 ptr ptr long) @ stdcall SymSetContext(long ptr ptr) -@ stub SymSetHomeDirectory -@ stub SymSetHomeDirectoryW +@ stdcall SymSetHomeDirectory(long str) +@ stdcall SymSetHomeDirectoryW(long wstr) @ stdcall SymSetOptions(long) @ stdcall SymSetParentWindow(long) @ stdcall SymSetScopeFromAddr(ptr int64) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 439b50e..ebc4644 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -2196,3 +2196,25 @@ BOOL WINAPI SymFromIndexW(HANDLE hProcess, ULONG64 BaseOfDll, DWORD index, PSYMB return FALSE; } + +/****************************************************************** + * SymSetHomeDirectory (DBGHELP.@) + * + */ +PCHAR WINAPI SymSetHomeDirectory(HANDLE hProcess, PCSTR dir) +{ + FIXME("(%p, %s): stub\n", hProcess, dir); + + return NULL; +} + +/****************************************************************** + * SymSetHomeDirectoryW (DBGHELP.@) + * + */ +PWSTR WINAPI SymSetHomeDirectoryW(HANDLE hProcess, PCWSTR dir) +{ + FIXME("(%p, %s): stub\n", hProcess, debugstr_w(dir)); + + return NULL; +}

1 0

Piotr Caban : wininet: Support Punycode in IsUrlCacheEntryExpiredW.
by Alexandre Julliard April 1, 2013

April 1, 2013

Module: wine Branch: master Commit: 41b582beff420e33a34f3f4fd3e9bd559499b3a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41b582beff420e33a34f3f4fd… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 1 13:16:37 2013 +0200 wininet: Support Punycode in IsUrlCacheEntryExpiredW. --- dlls/wininet/urlcache.c | 90 +++++------------------------------------------ 1 files changed, 9 insertions(+), 81 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 0d8c9aa..a9d533d 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -1507,23 +1507,6 @@ static BOOL urlcache_find_hash_entry(const urlcache_header *pHeader, LPCSTR lpsz return FALSE; } -static BOOL urlcache_find_hash_entryW(const urlcache_header *pHeader, LPCWSTR lpszUrl, struct hash_entry **ppHashEntry) -{ - LPSTR urlA; - BOOL ret; - - urlA = heap_strdupWtoA(lpszUrl); - if (!urlA) - { - SetLastError(ERROR_OUTOFMEMORY); - return FALSE; - } - - ret = urlcache_find_hash_entry(pHeader, urlA, ppHashEntry); - heap_free(urlA); - return ret; -} - /*********************************************************************** * urlcache_hash_entry_set_flags (Internal) * @@ -4022,7 +4005,7 @@ static BOOL urlcache_entry_is_expired(const entry_url *pUrlEntry, * dwFlags [I] Unknown * pftLastModified [O] Last modified time */ -BOOL WINAPI IsUrlCacheEntryExpiredA( LPCSTR url, DWORD dwFlags, FILETIME* pftLastModified ) +BOOL WINAPI IsUrlCacheEntryExpiredA(LPCSTR url, DWORD dwFlags, FILETIME* pftLastModified) { urlcache_header *pHeader; struct hash_entry *pHashEntry; @@ -4090,72 +4073,17 @@ BOOL WINAPI IsUrlCacheEntryExpiredA( LPCSTR url, DWORD dwFlags, FILETIME* pftLas * dwFlags [I] Unknown * pftLastModified [O] Last modified time */ -BOOL WINAPI IsUrlCacheEntryExpiredW( LPCWSTR url, DWORD dwFlags, FILETIME* pftLastModified ) +BOOL WINAPI IsUrlCacheEntryExpiredW(LPCWSTR url, DWORD dwFlags, FILETIME* pftLastModified) { - urlcache_header *pHeader; - struct hash_entry *pHashEntry; - const entry_header *pEntry; - const entry_url * pUrlEntry; - cache_container *pContainer; - BOOL expired; - - TRACE("(%s, %08x, %p)\n", debugstr_w(url), dwFlags, pftLastModified); - - if (!url || !pftLastModified) - return TRUE; - if (dwFlags) - FIXME("unknown flags 0x%08x\n", dwFlags); - - /* Any error implies that the URL is expired, i.e. not in the cache */ - if (cache_containers_findW(url, &pContainer)) - { - memset(pftLastModified, 0, sizeof(*pftLastModified)); - return TRUE; - } - - if (cache_container_open_index(pContainer, MIN_BLOCK_NO)) - { - memset(pftLastModified, 0, sizeof(*pftLastModified)); - return TRUE; - } - - if (!(pHeader = cache_container_lock_index(pContainer))) - { - memset(pftLastModified, 0, sizeof(*pftLastModified)); - return TRUE; - } - - if (!urlcache_find_hash_entryW(pHeader, url, &pHashEntry)) - { - cache_container_unlock_index(pContainer, pHeader); - memset(pftLastModified, 0, sizeof(*pftLastModified)); - TRACE("entry %s not found!\n", debugstr_w(url)); - return TRUE; - } - - if (!urlcache_find_hash_entryW(pHeader, url, &pHashEntry)) - { - cache_container_unlock_index(pContainer, pHeader); - memset(pftLastModified, 0, sizeof(*pftLastModified)); - TRACE("entry %s not found!\n", debugstr_w(url)); - return TRUE; - } - - pEntry = (const entry_header*)((LPBYTE)pHeader + pHashEntry->offset); - if (pEntry->signature != URL_SIGNATURE) - { - cache_container_unlock_index(pContainer, pHeader); - memset(pftLastModified, 0, sizeof(*pftLastModified)); - FIXME("Trying to retrieve entry of unknown format %s\n", debugstr_an((LPCSTR)&pEntry->signature, sizeof(DWORD))); - return TRUE; - } - - pUrlEntry = (const entry_url *)pEntry; - expired = urlcache_entry_is_expired(pUrlEntry, pftLastModified); + char *encoded_url; + BOOL ret; - cache_container_unlock_index(pContainer, pHeader); + if(!urlcache_encode_url_alloc(url, &encoded_url)) + return FALSE; - return expired; + ret = IsUrlCacheEntryExpiredA(encoded_url, dwFlags, pftLastModified); + heap_free(encoded_url); + return ret; } /***********************************************************************

1 0

Piotr Caban : wininet: Support Punycode in UnlockUrlCacheEntryFileW.
by Alexandre Julliard April 1, 2013

April 1, 2013

Module: wine Branch: master Commit: 6f35d68f42e84147a1367a6dd58266125d448adc URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f35d68f42e84147a1367a6dd… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 1 13:16:09 2013 +0200 wininet: Support Punycode in UnlockUrlCacheEntryFileW. --- dlls/wininet/urlcache.c | 74 +++++----------------------------------------- 1 files changed, 8 insertions(+), 66 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index f5f86c5..23ff308 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -2495,10 +2495,7 @@ BOOL WINAPI FreeUrlCacheSpaceA(LPCSTR lpszCachePath, DWORD dwSize, DWORD dwFilte * UnlockUrlCacheEntryFileA (WININET.@) * */ -BOOL WINAPI UnlockUrlCacheEntryFileA( - IN LPCSTR lpszUrlName, - IN DWORD dwReserved - ) +BOOL WINAPI UnlockUrlCacheEntryFileA(LPCSTR lpszUrlName, DWORD dwReserved) { urlcache_header *pHeader; struct hash_entry *pHashEntry; @@ -2574,72 +2571,17 @@ BOOL WINAPI UnlockUrlCacheEntryFileA( * UnlockUrlCacheEntryFileW (WININET.@) * */ -BOOL WINAPI UnlockUrlCacheEntryFileW( LPCWSTR lpszUrlName, DWORD dwReserved ) +BOOL WINAPI UnlockUrlCacheEntryFileW(LPCWSTR lpszUrlName, DWORD dwReserved) { - urlcache_header *pHeader; - struct hash_entry *pHashEntry; - entry_header *pEntry; - entry_url * pUrlEntry; - cache_container *pContainer; - DWORD error; - - TRACE("(%s, 0x%08x)\n", debugstr_w(lpszUrlName), dwReserved); - - if (dwReserved) - { - ERR("dwReserved != 0\n"); - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - error = cache_containers_findW(lpszUrlName, &pContainer); - if (error != ERROR_SUCCESS) - { - SetLastError(error); - return FALSE; - } - - error = cache_container_open_index(pContainer, MIN_BLOCK_NO); - if (error != ERROR_SUCCESS) - { - SetLastError(error); - return FALSE; - } - - if (!(pHeader = cache_container_lock_index(pContainer))) - return FALSE; - - if (!urlcache_find_hash_entryW(pHeader, lpszUrlName, &pHashEntry)) - { - cache_container_unlock_index(pContainer, pHeader); - TRACE("entry %s not found!\n", debugstr_w(lpszUrlName)); - SetLastError(ERROR_FILE_NOT_FOUND); - return FALSE; - } - - pEntry = (entry_header*)((LPBYTE)pHeader + pHashEntry->offset); - if (pEntry->signature != URL_SIGNATURE) - { - cache_container_unlock_index(pContainer, pHeader); - FIXME("Trying to retrieve entry of unknown format %s\n", debugstr_an((LPSTR)&pEntry->signature, sizeof(DWORD))); - SetLastError(ERROR_FILE_NOT_FOUND); - return FALSE; - } - - pUrlEntry = (entry_url *)pEntry; + char *url; + BOOL ret; - if (pUrlEntry->use_count == 0) - { - cache_container_unlock_index(pContainer, pHeader); + if(!urlcache_encode_url_alloc(lpszUrlName, &url)) return FALSE; - } - pUrlEntry->use_count--; - if (!pUrlEntry->use_count) - urlcache_hash_entry_set_flags(pHashEntry, HASHTABLE_URL); - - cache_container_unlock_index(pContainer, pHeader); - return TRUE; + ret = UnlockUrlCacheEntryFileA(url, dwReserved); + heap_free(url); + return ret; } /***********************************************************************

1 0

Piotr Caban : wininet: Correctly set SYSTEMTIME year in HTTP_HttpQueryInfoW .
by Alexandre Julliard April 1, 2013

April 1, 2013

Module: wine Branch: master Commit: ef4db477f08a7f83d506621876b46b2a623edd99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef4db477f08a7f83d50662187… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 1 15:06:26 2013 +0200 wininet: Correctly set SYSTEMTIME year in HTTP_HttpQueryInfoW. --- dlls/wininet/http.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index d0ed459..18279da 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3541,7 +3541,7 @@ static DWORD HTTP_HttpQueryInfoW(http_request_t *request, DWORD dwInfoLevel, STHook->wDayOfWeek = tmpTM.tm_wday; STHook->wMonth = tmpTM.tm_mon + 1; STHook->wSecond = tmpTM.tm_sec; - STHook->wYear = tmpTM.tm_year; + STHook->wYear = 1900+tmpTM.tm_year; TRACE(" returning time: %04d/%02d/%02d - %d - %02d:%02d:%02d.%02d\n", STHook->wYear, STHook->wMonth, STHook->wDay, STHook->wDayOfWeek,

1 0

Piotr Caban : wininet: Support Punycode in DeleteUrlCacheEntryW.
by Alexandre Julliard April 1, 2013

April 1, 2013

Module: wine Branch: master Commit: 2f3f9739234946ac9b1e518f75033eb42854945d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f3f9739234946ac9b1e518f7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 1 13:16:24 2013 +0200 wininet: Support Punycode in DeleteUrlCacheEntryW. --- dlls/wininet/urlcache.c | 51 +++------------------------------------------- 1 files changed, 4 insertions(+), 47 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 23ff308..0d8c9aa 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -3477,57 +3477,14 @@ BOOL WINAPI DeleteUrlCacheEntryA(LPCSTR lpszUrlName) */ BOOL WINAPI DeleteUrlCacheEntryW(LPCWSTR lpszUrlName) { - cache_container *pContainer; - urlcache_header *pHeader; - struct hash_entry *pHashEntry; - LPSTR urlA; - DWORD error; + char *url; BOOL ret; - TRACE("(%s)\n", debugstr_w(lpszUrlName)); - - urlA = heap_strdupWtoA(lpszUrlName); - if (!urlA) - { - SetLastError(ERROR_OUTOFMEMORY); - return FALSE; - } - - error = cache_containers_findW(lpszUrlName, &pContainer); - if (error != ERROR_SUCCESS) - { - heap_free(urlA); - SetLastError(error); - return FALSE; - } - - error = cache_container_open_index(pContainer, MIN_BLOCK_NO); - if (error != ERROR_SUCCESS) - { - heap_free(urlA); - SetLastError(error); - return FALSE; - } - - if (!(pHeader = cache_container_lock_index(pContainer))) - { - heap_free(urlA); - return FALSE; - } - - if (!urlcache_find_hash_entry(pHeader, urlA, &pHashEntry)) - { - cache_container_unlock_index(pContainer, pHeader); - TRACE("entry %s not found!\n", debugstr_a(urlA)); - heap_free(urlA); - SetLastError(ERROR_FILE_NOT_FOUND); + if(!urlcache_encode_url_alloc(lpszUrlName, &url)) return FALSE; - } - ret = urlcache_entry_delete(pContainer, pHeader, pHashEntry); - - cache_container_unlock_index(pContainer, pHeader); - heap_free(urlA); + ret = DeleteUrlCacheEntryA(url); + heap_free(url); return ret; }

1 0