wine-commits April 2013

wine-commits@winehq.org

2 participants
579 discussions

Michael Stefaniuc : dplayx: Add a separate refcount for IDirectPlay3.
by Alexandre Julliard 04 Apr '13

04 Apr '13

Module: wine Branch: master Commit: ac0368e800b2c96946ea991cd682693ead0f5037 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac0368e800b2c96946ea991cd… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 29 17:15:57 2013 +0100 dplayx: Add a separate refcount for IDirectPlay3. --- dlls/dplayx/dplay.c | 409 +++++++++++++++++++++++++++++++++++++++++++- dlls/dplayx/dplay_global.h | 3 +- dlls/dplayx/tests/dplayx.c | 2 +- 3 files changed, 411 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ac0368e800b2c96946ea9…

1 0

Michael Stefaniuc : dplayx: Add a separate refcount for IDirectPlay3A.
by Alexandre Julliard 04 Apr '13

04 Apr '13

Module: wine Branch: master Commit: 36dccf839a9432196da94be100e4ee15604ecd54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36dccf839a9432196da94be10… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 29 17:15:01 2013 +0100 dplayx: Add a separate refcount for IDirectPlay3A. --- dlls/dplayx/dplay.c | 409 +++++++++++++++++++++++++++++++++++++++++++- dlls/dplayx/dplay_global.h | 3 +- dlls/dplayx/tests/dplayx.c | 2 +- 3 files changed, 411 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=36dccf839a9432196da94…

1 0

Michael Stefaniuc : dplayx: Add a separate refcount for IDirectPlay2.
by Alexandre Julliard 04 Apr '13

04 Apr '13

Module: wine Branch: master Commit: 9378c4182f6b4f1f4db5e6538eb36e24e4728aa6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9378c4182f6b4f1f4db5e6538… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 29 17:14:07 2013 +0100 dplayx: Add a separate refcount for IDirectPlay2. --- dlls/dplayx/dplay.c | 282 +++++++++++++++++++++++++++++++++++++++++++- dlls/dplayx/dplay_global.h | 3 +- dlls/dplayx/tests/dplayx.c | 2 +- 3 files changed, 284 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9378c4182f6b4f1f4db5e…

1 0

Michael Stefaniuc : dplayx: Add a separate refcount for IDirectPlay2A.
by Alexandre Julliard 04 Apr '13

04 Apr '13

Module: wine Branch: master Commit: cf894d4c0d4a7acc30ef8d009db40e9b066ecd7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf894d4c0d4a7acc30ef8d009… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 29 17:13:11 2013 +0100 dplayx: Add a separate refcount for IDirectPlay2A. --- dlls/dplayx/dplay.c | 282 +++++++++++++++++++++++++++++++++++++++++++- dlls/dplayx/dplay_global.h | 3 +- dlls/dplayx/tests/dplayx.c | 2 +- 3 files changed, 284 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cf894d4c0d4a7acc30ef8…

1 0

Michael Stefaniuc : dplayx: Get rid of the IDirectPlayImpl aliases.
by Alexandre Julliard 04 Apr '13

04 Apr '13

Module: wine Branch: master Commit: f546609d09f9412b3fcc72a3a294ade29e98b375 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f546609d09f9412b3fcc72a3a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 29 17:12:33 2013 +0100 dplayx: Get rid of the IDirectPlayImpl aliases. --- dlls/dplayx/dplay.c | 149 +++++++++++++++------------------------- dlls/dplayx/dplay_global.h | 18 ++---- dlls/dplayx/dplaysp.c | 8 +- dlls/dplayx/dplayx_messages.c | 31 ++++----- dlls/dplayx/dplayx_messages.h | 10 ++-- dlls/dplayx/lobbysp.c | 8 +- dlls/dplayx/name_server.c | 6 +- dlls/dplayx/name_server.h | 2 +- 8 files changed, 90 insertions(+), 142 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f546609d09f9412b3fcc7…

1 0

Michael Stefaniuc : dplayx: Merge dpinit.h into dplay_global.h.
by Alexandre Julliard 04 Apr '13

04 Apr '13

Module: wine Branch: master Commit: 5e03836603db95347a75e4d7d7906bee606a93ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e03836603db95347a75e4d7d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 29 17:11:29 2013 +0100 dplayx: Merge dpinit.h into dplay_global.h. --- dlls/dplayx/dpclassfactory.c | 2 +- dlls/dplayx/dpinit.h | 37 ------------------------------------- dlls/dplayx/dplay.c | 1 - dlls/dplayx/dplay_global.h | 5 +++++ dlls/dplayx/dplaysp.c | 1 - dlls/dplayx/dplobby.c | 1 - dlls/dplayx/lobbysp.c | 1 - 7 files changed, 6 insertions(+), 42 deletions(-) diff --git a/dlls/dplayx/dpclassfactory.c b/dlls/dplayx/dpclassfactory.c index 438ad60..c64c5fc 100644 --- a/dlls/dplayx/dpclassfactory.c +++ b/dlls/dplayx/dpclassfactory.c @@ -31,7 +31,7 @@ #include "dplay.h" #include "dplobby.h" #include "initguid.h" -#include "dpinit.h" +#include "dplay_global.h" WINE_DEFAULT_DEBUG_CHANNEL(dplay); diff --git a/dlls/dplayx/dpinit.h b/dlls/dplayx/dpinit.h deleted file mode 100644 index 090b67a..0000000 --- a/dlls/dplayx/dpinit.h +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright 1999, 2000 Peter Hunnisett - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#ifndef __WINE_DPINIT_H -#define __WINE_DPINIT_H - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "wtypes.h" -#include "dplay_global.h" - -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; -extern HRESULT DPLSP_CreateInterface( REFIID riid, LPVOID* ppvObj, - IDirectPlay2Impl* dp ) DECLSPEC_HIDDEN; - - -#endif diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index b7b9cdd..eb52cd2 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -35,7 +35,6 @@ #include "wine/unicode.h" #include "wine/debug.h" -#include "dpinit.h" #include "dplayx_global.h" #include "name_server.h" #include "dplayx_queue.h" diff --git a/dlls/dplayx/dplay_global.h b/dlls/dplayx/dplay_global.h index 18eb8077..0928c1a 100644 --- a/dlls/dplayx/dplay_global.h +++ b/dlls/dplayx/dplay_global.h @@ -209,4 +209,9 @@ extern HRESULT DP_SetSPPlayerData( IDirectPlay2Impl* lpDP, DPID idPlayer, LPVOID /* DP external interfaces to call into DPSP interface */ extern LPVOID DPSP_CreateSPPlayerData(void) 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, void **ppvObj, IDirectPlayImpl *dp ) DECLSPEC_HIDDEN; +extern HRESULT DPLSP_CreateInterface( REFIID riid, void **ppvObj, IDirectPlayImpl *dp ) DECLSPEC_HIDDEN; + #endif /* __WINE_DPLAY_GLOBAL_INCLUDED */ diff --git a/dlls/dplayx/dplaysp.c b/dlls/dplayx/dplaysp.c index 9ce6910..4a8c4a5 100644 --- a/dlls/dplayx/dplaysp.c +++ b/dlls/dplayx/dplaysp.c @@ -22,7 +22,6 @@ #include "winerror.h" #include "wine/debug.h" -#include "dpinit.h" #include "wine/dplaysp.h" #include "dplay_global.h" #include "name_server.h" diff --git a/dlls/dplayx/dplobby.c b/dlls/dplayx/dplobby.c index cbdd128..46a2168 100644 --- a/dlls/dplayx/dplobby.c +++ b/dlls/dplayx/dplobby.c @@ -32,7 +32,6 @@ #include "dplayx_messages.h" #include "dplayx_queue.h" #include "dplobby.h" -#include "dpinit.h" WINE_DEFAULT_DEBUG_CHANNEL(dplay); diff --git a/dlls/dplayx/lobbysp.c b/dlls/dplayx/lobbysp.c index 737cb3f..18d9d00 100644 --- a/dlls/dplayx/lobbysp.c +++ b/dlls/dplayx/lobbysp.c @@ -23,7 +23,6 @@ #include "lobbysp.h" #include "dplay_global.h" -#include "dpinit.h" WINE_DEFAULT_DEBUG_CHANNEL(dplay);

1 0

Michael Stefaniuc : dplayx: Remove superfluous forward declarations.
by Alexandre Julliard 04 Apr '13

04 Apr '13

Module: wine Branch: master Commit: f92e17033c77eea84a1873521214800ba95ddb63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f92e17033c77eea84a1873521… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 29 17:10:33 2013 +0100 dplayx: Remove superfluous forward declarations. --- dlls/dplayx/dplay.c | 64 ----------------------------------------- dlls/dplayx/dplayx_messages.c | 7 ---- dlls/dplayx/dplobby.c | 13 -------- dlls/dplayx/lobbysp.h | 1 - 4 files changed, 0 insertions(+), 85 deletions(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index 7d2beb3..b7b9cdd 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -52,83 +52,28 @@ extern HRESULT DPL_CreateCompoundAddress /* Local function prototypes */ static lpPlayerList DP_FindPlayer( IDirectPlay2AImpl* This, DPID dpid ); -static lpPlayerData DP_CreatePlayer( IDirectPlay2Impl* iface, LPDPID lpid, - LPDPNAME lpName, DWORD dwFlags, - HANDLE hEvent, BOOL bAnsi ); static BOOL DP_CopyDPNAMEStruct( LPDPNAME lpDst, const DPNAME *lpSrc, BOOL bAnsi ); -static void DP_SetPlayerData( lpPlayerData lpPData, DWORD dwFlags, - LPVOID lpData, DWORD dwDataSize ); - -static lpGroupData DP_CreateGroup( IDirectPlay2AImpl* iface, const DPID *lpid, - const DPNAME *lpName, DWORD dwFlags, - DPID idParent, BOOL bAnsi ); static void DP_SetGroupData( lpGroupData lpGData, DWORD dwFlags, LPVOID lpData, DWORD dwDataSize ); static void DP_DeleteDPNameStruct( LPDPNAME lpDPName ); -static void DP_DeletePlayer( IDirectPlay2Impl* This, DPID dpid ); static BOOL CALLBACK cbDeletePlayerFromAllGroups( DPID dpId, DWORD dwPlayerType, LPCDPNAME lpName, DWORD dwFlags, LPVOID lpContext ); static lpGroupData DP_FindAnyGroup( IDirectPlay2AImpl* This, DPID dpid ); -static BOOL CALLBACK cbRemoveGroupOrPlayer( DPID dpId, DWORD dwPlayerType, - LPCDPNAME lpName, DWORD dwFlags, - LPVOID lpContext ); -static void DP_DeleteGroup( IDirectPlay2Impl* This, DPID dpid ); /* Helper methods for player/group interfaces */ -static HRESULT DP_IF_CreatePlayer - ( IDirectPlay2Impl* This, LPVOID lpMsgHdr, LPDPID lpidPlayer, - LPDPNAME lpPlayerName, HANDLE hEvent, LPVOID lpData, - DWORD dwDataSize, DWORD dwFlags, BOOL bAnsi ); -static HRESULT DP_IF_DestroyGroup - ( IDirectPlay2Impl* This, LPVOID lpMsgHdr, DPID idGroup, BOOL bAnsi ); -static HRESULT DP_IF_DestroyPlayer - ( IDirectPlay2Impl* This, LPVOID lpMsgHdr, DPID idPlayer, BOOL bAnsi ); -static HRESULT DP_IF_GetGroupName - ( IDirectPlay2Impl* This, DPID idGroup, LPVOID lpData, - LPDWORD lpdwDataSize, BOOL bAnsi ); -static HRESULT DP_IF_GetPlayerName - ( IDirectPlay2Impl* This, DPID idPlayer, LPVOID lpData, - LPDWORD lpdwDataSize, BOOL bAnsi ); -static HRESULT DP_IF_SetGroupName - ( IDirectPlay2Impl* This, DPID idGroup, LPDPNAME lpGroupName, - DWORD dwFlags, BOOL bAnsi ); -static HRESULT DP_IF_SetPlayerName - ( IDirectPlay2Impl* This, DPID idPlayer, LPDPNAME lpPlayerName, - DWORD dwFlags, BOOL bAnsi ); -static HRESULT DP_IF_CreateGroup - ( IDirectPlay2AImpl* This, LPVOID lpMsgHdr, LPDPID lpidGroup, - LPDPNAME lpGroupName, LPVOID lpData, DWORD dwDataSize, - DWORD dwFlags, BOOL bAnsi ); -static HRESULT DP_IF_CreateGroupInGroup - ( IDirectPlay3Impl* This, LPVOID lpMsgHdr, DPID idParentGroup, - LPDPID lpidGroup, LPDPNAME lpGroupName, LPVOID lpData, - DWORD dwDataSize, DWORD dwFlags, BOOL bAnsi ); static HRESULT DP_SetSessionDesc ( IDirectPlay2Impl* This, LPCDPSESSIONDESC2 lpSessDesc, DWORD dwFlags, BOOL bInitial, BOOL bAnsi ); -static HRESULT DP_SecureOpen - ( IDirectPlay2Impl* This, LPCDPSESSIONDESC2 lpsd, DWORD dwFlags, - LPCDPSECURITYDESC lpSecurity, LPCDPCREDENTIALS lpCredentials, - BOOL bAnsi ); -static HRESULT DP_IF_Receive - ( IDirectPlay2Impl* This, LPDPID lpidFrom, LPDPID lpidTo, - DWORD dwFlags, LPVOID lpData, LPDWORD lpdwDataSize, BOOL bAnsi ); static HRESULT DP_SP_SendEx ( IDirectPlay2Impl* This, DWORD dwFlags, LPVOID lpData, DWORD dwDataSize, DWORD dwPriority, DWORD dwTimeout, LPVOID lpContext, LPDWORD lpdwMsgID ); -static BOOL CALLBACK cbDPCreateEnumConnections( LPCGUID lpguidSP, - LPVOID lpConnection, DWORD dwConnectionSize, LPCDPNAME lpName, - DWORD dwFlags, LPVOID lpContext ); static BOOL DP_BuildSPCompoundAddr( LPGUID lpcSpGuid, LPVOID* lplpAddrBuf, LPDWORD lpdwBufSize ); - - -static inline DPID DP_NextObjectId(void); static DPID DP_GetRemoteNextObjectId(void); static DWORD DP_CalcSessionDescSize( LPCDPSESSIONDESC2 lpSessDesc, BOOL bAnsi ); @@ -136,15 +81,6 @@ static void DP_CopySessionDesc( LPDPSESSIONDESC2 destSessionDesc, LPCDPSESSIONDESC2 srcSessDesc, BOOL bAnsi ); -static HMODULE DP_LoadSP( LPCGUID lpcGuid, LPSPINITDATA lpSpData, LPBOOL lpbIsDpSp ); -static HRESULT DP_InitializeDPSP( IDirectPlay3Impl* This, HMODULE hServiceProvider ); -static HRESULT DP_InitializeDPLSP( IDirectPlay3Impl* This, HMODULE hServiceProvider ); - - - - - - #define DPID_NOPARENT_GROUP 0 /* Magic number to indicate no parent of group */ #define DPID_SYSTEM_GROUP DPID_NOPARENT_GROUP /* If system group is supported we don't have to change much */ diff --git a/dlls/dplayx/dplayx_messages.c b/dlls/dplayx/dplayx_messages.c index 7756c9f..dc712fd 100644 --- a/dlls/dplayx/dplayx_messages.c +++ b/dlls/dplayx/dplayx_messages.c @@ -154,13 +154,6 @@ end_of_thread: } /* DP messaging stuff */ -static HANDLE DP_MSG_BuildAndLinkReplyStruct( IDirectPlay2Impl* This, - LPDP_MSG_REPLY_STRUCT_LIST lpReplyStructList, - WORD wReplyCommandId ); -static LPVOID DP_MSG_CleanReplyStruct( LPDP_MSG_REPLY_STRUCT_LIST lpReplyStructList, - LPVOID* lplpReplyMsg, LPDWORD lpdwMsgBodySize ); - - static HANDLE DP_MSG_BuildAndLinkReplyStruct( IDirectPlay2Impl* This, LPDP_MSG_REPLY_STRUCT_LIST lpReplyStructList, WORD wReplyCommandId ) diff --git a/dlls/dplayx/dplobby.c b/dlls/dplayx/dplobby.c index 204ff59..cbdd128 100644 --- a/dlls/dplayx/dplobby.c +++ b/dlls/dplayx/dplobby.c @@ -54,19 +54,6 @@ static HRESULT DPL_CreateAddress( REFGUID guidSP, REFGUID guidDataType, LPCVOID LPVOID lpAddress, LPDWORD lpdwAddressSize, BOOL bAnsiInterface ); - -extern HRESULT DPL_EnumAddress( LPDPENUMADDRESSCALLBACK lpEnumAddressCallback, LPCVOID lpAddress, - DWORD dwAddressSize, LPVOID lpContext ); - -static HRESULT DPL_ConnectEx( IDirectPlayLobbyAImpl* This, - DWORD dwFlags, REFIID riid, - LPVOID* lplpDP, IUnknown* pUnk ); - -static BOOL DPL_CreateAndSetLobbyHandles( DWORD dwDestProcessId, HANDLE hDestProcess, - LPHANDLE lphStart, LPHANDLE lphDeath, - LPHANDLE lphRead ); - - /***************************************************************************** * IDirectPlayLobby {1,2,3} implementation structure * diff --git a/dlls/dplayx/lobbysp.h b/dlls/dplayx/lobbysp.h index f20c8e9..8d87116 100644 --- a/dlls/dplayx/lobbysp.h +++ b/dlls/dplayx/lobbysp.h @@ -458,7 +458,6 @@ typedef struct SPDATA_INIT } SPDATA_INIT, *LPSPDATA_INIT; typedef HRESULT (WINAPI *LPSP_INIT)(LPSPDATA_INIT); -HRESULT WINAPI DPLSPInit(LPSPDATA_INIT) DECLSPEC_HIDDEN; /* Define the COM interface */ #define INTERFACE IDPLobbySP

1 0

Michael Stefaniuc : dplayx: Get rid of the IDirectPlayXImpl to IDirectPlayImpl casts.
by Alexandre Julliard 04 Apr '13

04 Apr '13

Module: wine Branch: master Commit: 2a079ce62a082cf5ea11a40b2277be6437f532a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a079ce62a082cf5ea11a40b2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 29 17:09:40 2013 +0100 dplayx: Get rid of the IDirectPlayXImpl to IDirectPlayImpl casts. --- dlls/dplayx/dplay.c | 11 +++-------- 1 files changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index edcb20f..7d2beb3 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -1482,7 +1482,7 @@ static HRESULT DP_IF_DestroyGroup return DPERR_INVALIDPLAYER; /* yes player */ } - context.This = (IDirectPlay3Impl*)This; + context.This = This; context.bAnsi = bAnsi; context.idGroup = idGroup; @@ -2919,15 +2919,10 @@ static HRESULT DP_IF_CreateGroupInGroup } /* Verify that the specified parent is valid */ - if( ( lpGParentData = DP_FindAnyGroup( (IDirectPlay2AImpl*)This, - idParentGroup ) ) == NULL - ) - { + if( ( lpGParentData = DP_FindAnyGroup(This, idParentGroup ) ) == NULL ) return DPERR_INVALIDGROUP; - } - lpGData = DP_CreateGroup( (IDirectPlay2AImpl*)This, lpidGroup, lpGroupName, - dwFlags, idParentGroup, bAnsi ); + lpGData = DP_CreateGroup(This, lpidGroup, lpGroupName, dwFlags, idParentGroup, bAnsi ); if( lpGData == NULL ) {

1 0

Michael Stefaniuc : dplayx: Forward AW agnostic IDirectPlay4A stub methods to the W versions.
by Alexandre Julliard 04 Apr '13

04 Apr '13

Module: wine Branch: master Commit: 12a26e1d017cb506cce920e303423590e030cee8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12a26e1d017cb506cce920e30… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 29 17:08:49 2013 +0100 dplayx: Forward AW agnostic IDirectPlay4A stub methods to the W versions. --- dlls/dplayx/dplay.c | 50 ++++++++++++++++++++++---------------------------- 1 files changed, 22 insertions(+), 28 deletions(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index 4658f4e..edcb20f 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -3750,12 +3750,11 @@ static HRESULT WINAPI IDirectPlay4Impl_SetGroupConnectionSettings( IDirectPlay4 return DP_OK; } -static HRESULT WINAPI IDirectPlay4AImpl_StartSession( IDirectPlay4A *iface, DWORD dwFlags, - DPID idGroup ) +static HRESULT WINAPI IDirectPlay4AImpl_StartSession( IDirectPlay4A *iface, DWORD flags, + DPID group ) { - IDirectPlayImpl *This = impl_from_IDirectPlay4A( iface ); - FIXME("(%p)->(0x%08x,0x%08x): stub\n", This, dwFlags, idGroup ); - return DP_OK; + IDirectPlayImpl *This = impl_from_IDirectPlay4A( iface ); + return IDirectPlayX_StartSession( &This->IDirectPlay4_iface, flags, group ); } static HRESULT WINAPI IDirectPlay4Impl_StartSession( IDirectPlay4 *iface, DWORD flags, DPID group ) @@ -3765,12 +3764,11 @@ static HRESULT WINAPI IDirectPlay4Impl_StartSession( IDirectPlay4 *iface, DWORD return DP_OK; } -static HRESULT WINAPI IDirectPlay4AImpl_GetGroupFlags( IDirectPlay4A *iface, DPID idGroup, - DWORD *lpdwFlags ) +static HRESULT WINAPI IDirectPlay4AImpl_GetGroupFlags( IDirectPlay4A *iface, DPID group, + DWORD *flags ) { - IDirectPlayImpl *This = impl_from_IDirectPlay4A( iface ); - FIXME("(%p)->(0x%08x,%p): stub\n", This, idGroup, lpdwFlags ); - return DP_OK; + IDirectPlayImpl *This = impl_from_IDirectPlay4A( iface ); + return IDirectPlayX_GetGroupFlags( &This->IDirectPlay4_iface, group, flags ); } static HRESULT WINAPI IDirectPlay4Impl_GetGroupFlags( IDirectPlay4 *iface, DPID group, @@ -3820,12 +3818,11 @@ static HRESULT WINAPI IDirectPlay4Impl_GetPlayerAccount( IDirectPlay4 *iface, DP return DP_OK; } -static HRESULT WINAPI IDirectPlay4AImpl_GetPlayerFlags( IDirectPlay4A *iface, DPID idPlayer, - DWORD *lpdwFlags ) +static HRESULT WINAPI IDirectPlay4AImpl_GetPlayerFlags( IDirectPlay4A *iface, DPID player, + DWORD *flags ) { - IDirectPlayImpl *This = impl_from_IDirectPlay4A( iface ); - FIXME("(%p)->(0x%08x,%p): stub\n", This, idPlayer, lpdwFlags ); - return DP_OK; + IDirectPlayImpl *This = impl_from_IDirectPlay4A( iface ); + return IDirectPlayX_GetPlayerFlags( &This->IDirectPlay4_iface, player, flags ); } static HRESULT WINAPI IDirectPlay4Impl_GetPlayerFlags( IDirectPlay4 *iface, DPID player, @@ -3836,12 +3833,11 @@ static HRESULT WINAPI IDirectPlay4Impl_GetPlayerFlags( IDirectPlay4 *iface, DPID return DP_OK; } -static HRESULT WINAPI DirectPlay4AImpl_GetGroupOwner - ( LPDIRECTPLAY4A iface, DPID idGroup, LPDPID lpidGroupOwner ) +static HRESULT WINAPI IDirectPlay4AImpl_GetGroupOwner( IDirectPlay4A *iface, DPID group, + DPID *owner ) { - IDirectPlayImpl *This = impl_from_IDirectPlay4A( iface ); - FIXME("(%p)->(0x%08x,%p): stub\n", This, idGroup, lpidGroupOwner ); - return DP_OK; + IDirectPlayImpl *This = impl_from_IDirectPlay4A( iface ); + return IDirectPlayX_GetGroupOwner( &This->IDirectPlay4_iface, group, owner ); } static HRESULT WINAPI IDirectPlay4Impl_GetGroupOwner( IDirectPlay4 *iface, DPID group, @@ -3852,12 +3848,11 @@ static HRESULT WINAPI IDirectPlay4Impl_GetGroupOwner( IDirectPlay4 *iface, DPID return DP_OK; } -static HRESULT WINAPI DirectPlay4AImpl_SetGroupOwner - ( LPDIRECTPLAY4A iface, DPID idGroup , DPID idGroupOwner ) +static HRESULT WINAPI IDirectPlay4AImpl_SetGroupOwner( IDirectPlay4A *iface, DPID group, + DPID owner ) { - IDirectPlayImpl *This = impl_from_IDirectPlay4A( iface ); - FIXME("(%p)->(0x%08x,0x%08x): stub\n", This, idGroup, idGroupOwner ); - return DP_OK; + IDirectPlayImpl *This = impl_from_IDirectPlay4A( iface ); + return IDirectPlayX_SetGroupOwner( &This->IDirectPlay4_iface, group, owner ); } static HRESULT WINAPI IDirectPlay4Impl_SetGroupOwner( IDirectPlay4 *iface, DPID group , @@ -4179,9 +4174,8 @@ static const IDirectPlay4Vtbl dp4A_vt = IDirectPlay4AImpl_GetGroupParent, IDirectPlay4AImpl_GetPlayerAccount, IDirectPlay4AImpl_GetPlayerFlags, - - DirectPlay4AImpl_GetGroupOwner, - DirectPlay4AImpl_SetGroupOwner, + IDirectPlay4AImpl_GetGroupOwner, + IDirectPlay4AImpl_SetGroupOwner, IDirectPlay4AImpl_SendEx, IDirectPlay4AImpl_GetMessageQueue, IDirectPlay4AImpl_CancelMessage,

1 0

André Hentschel : winedev: Update opengl chapter.
by Alexandre Julliard 04 Apr '13

04 Apr '13

Module: docs Branch: master Commit: fb7b36cca4cfcc40d299569d686d4ec7dea1b46e URL: http://source.winehq.org/git/docs.git/?a=commit;h=fb7b36cca4cfcc40d299569d6… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Apr 4 02:46:10 2013 +0200 winedev: Update opengl chapter. --- en/winedev-opengl.sgml | 28 ++++------------------------ 1 files changed, 4 insertions(+), 24 deletions(-) diff --git a/en/winedev-opengl.sgml b/en/winedev-opengl.sgml index d26b742..c953e96 100644 --- a/en/winedev-opengl.sgml +++ b/en/winedev-opengl.sgml @@ -136,10 +136,7 @@ choosing if one wants a depth / alpha buffer, the size of these buffers, ...) and to do the 'page flipping' in double buffer mode. This is implemented in - <filename>dlls/x11drv/opengl.c</filename> (all these - functions are part of Wine's graphic driver function - pointer table and thus could be reimplemented if ever Wine - works on another Windowing system than X). + <filename>dlls/winex11.drv/opengl.c</filename>. </para> </listitem> <listitem> @@ -222,23 +219,6 @@ <title>Known problems</title> <sect2> - <title>When running an OpenGL application, the screen flickers</title> - - <para> - Due to restrictions (that do not exist in Windows) on OpenGL - contexts, if you want to prevent the screen to flicker when - using OpenGL applications (all games are using double-buffered - contexts), you need to set the following option in your - <filename>~/.wine/config</filename> file - in the <literal>[x11drv]</literal> section: - <programlisting> -DesktopDoubleBuffered = Y - </programlisting> - and to run Wine in desktop mode. - </para> - </sect2> - - <sect2> <title>Unknown extension error message:</title> <screen> @@ -284,7 +264,7 @@ Please report (lionel.ulmer(a)free.fr) ! </sect2> <sect2> - <title><filename>libopengl32.so</filename> is built but it is still not working</title> + <title><filename>opengl32.dll.so</filename> is built but it is still not working</title> <para> This may be caused by some missing functions required by @@ -310,12 +290,12 @@ int main(void) <listitem> <para> try to compile it by linking both libwine and - libopengl32 (this command line supposes that you + opengl32 (this command line supposes that you installed the Wine libraries in <filename>/usr/local/lib</filename>, YMMV) : </para> <programlisting> -gcc dummy.c -L/usr/local/lib -lwine -lopengl32 +gcc dummy.c -L/usr/local/lib -L/usr/local/lib/wine -lwine -lopengl32 </programlisting> </listitem> <listitem>

1 0

← Newer
1
...
40
41
42
43
44
45
46
...
58
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2013