Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
878a6a5a
Commit
878a6a5a
authored
Mar 29, 2013
by
Michael Stefaniuc
Committed by
Alexandre Julliard
Apr 02, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dplayx: Merge the IDirectPlay4_Close helper.
parent
5e0da570
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
27 additions
and
38 deletions
+27
-38
dplay.c
dlls/dplayx/dplay.c
+27
-38
No files found.
dlls/dplayx/dplay.c
View file @
878a6a5a
...
...
@@ -156,7 +156,6 @@ static HRESULT DP_IF_SetGroupData
static
HRESULT
DP_IF_GetPlayerCaps
(
IDirectPlay2Impl
*
This
,
DPID
idPlayer
,
LPDPCAPS
lpDPCaps
,
DWORD
dwFlags
);
static
HRESULT
DP_IF_Close
(
IDirectPlay2Impl
*
This
,
BOOL
bAnsi
);
static
HRESULT
DP_IF_CancelMessage
(
IDirectPlay4Impl
*
This
,
DWORD
dwMsgID
,
DWORD
dwFlags
,
DWORD
dwMinPriority
,
DWORD
dwMaxPriority
,
BOOL
bAnsi
);
...
...
@@ -670,49 +669,39 @@ static HRESULT WINAPI DirectPlay2WImpl_AddPlayerToGroup
return
DP_IF_AddPlayerToGroup
(
This
,
NULL
,
idGroup
,
idPlayer
,
FALSE
);
}
static
HRESULT
DP_IF_Close
(
IDirectPlay2Impl
*
This
,
BOOL
bAnsi
)
static
HRESULT
WINAPI
IDirectPlay4AImpl_Close
(
IDirectPlay4A
*
iface
)
{
HRESULT
hr
=
DP_OK
;
TRACE
(
"(%p)->(%u)
\n
"
,
This
,
bAnsi
);
/* FIXME: Need to find a new host I assume (how?) */
/* FIXME: Need to destroy all local groups */
/* FIXME: Need to migrate all remotely visible players to the new host */
/* Invoke the SP callback to inform of session close */
if
(
This
->
dp2
->
spData
.
lpCB
->
CloseEx
)
{
DPSP_CLOSEDATA
data
;
TRACE
(
"Calling SP CloseEx
\n
"
);
IDirectPlayImpl
*
This
=
impl_from_IDirectPlay4A
(
iface
);
return
IDirectPlayX_Close
(
&
This
->
IDirectPlay4_iface
);
}
data
.
lpISP
=
This
->
dp2
->
spData
.
lpISP
;
static
HRESULT
WINAPI
IDirectPlay4Impl_Close
(
IDirectPlay4
*
iface
)
{
IDirectPlayImpl
*
This
=
impl_from_IDirectPlay4
(
iface
);
HRESULT
hr
=
DP_OK
;
hr
=
(
*
This
->
dp2
->
spData
.
lpCB
->
CloseEx
)(
&
data
);
TRACE
(
"(%p)"
,
This
);
}
else
if
(
This
->
dp2
->
spData
.
lpCB
->
Close
)
/* Try obsolete version */
{
TRACE
(
"Calling SP Close (obsolete interface)
\n
"
);
/* FIXME: Need to find a new host I assume (how?) */
/* FIXME: Need to destroy all local groups */
/* FIXME: Need to migrate all remotely visible players to the new host */
hr
=
(
*
This
->
dp2
->
spData
.
lpCB
->
Close
)();
}
return
hr
;
}
/* Invoke the SP callback to inform of session close */
if
(
This
->
dp2
->
spData
.
lpCB
->
CloseEx
)
{
DPSP_CLOSEDATA
data
;
static
HRESULT
WINAPI
IDirectPlay4AImpl_Close
(
IDirectPlay4A
*
iface
)
{
IDirectPlayImpl
*
This
=
impl_from_IDirectPlay4A
(
iface
);
return
DP_IF_Close
(
This
,
TRUE
);
}
TRACE
(
"Calling SP CloseEx
\n
"
);
data
.
lpISP
=
This
->
dp2
->
spData
.
lpISP
;
hr
=
(
*
This
->
dp2
->
spData
.
lpCB
->
CloseEx
)(
&
data
);
}
else
if
(
This
->
dp2
->
spData
.
lpCB
->
Close
)
/* Try obsolete version */
{
TRACE
(
"Calling SP Close (obsolete interface)
\n
"
);
hr
=
(
*
This
->
dp2
->
spData
.
lpCB
->
Close
)();
}
static
HRESULT
WINAPI
DirectPlay2WImpl_Close
(
LPDIRECTPLAY2
iface
)
{
IDirectPlay2Impl
*
This
=
(
IDirectPlay2Impl
*
)
iface
;
return
DP_IF_Close
(
This
,
FALSE
);
return
hr
;
}
static
...
...
@@ -4596,7 +4585,7 @@ static const IDirectPlay4Vtbl dp4_vt =
IDirectPlay4Impl_Release
,
XCAST
(
AddPlayerToGroup
)
DirectPlay2WImpl_AddPlayerToGroup
,
XCAST
(
Close
)
DirectPlay2W
Impl_Close
,
IDirectPlay4
Impl_Close
,
XCAST
(
CreateGroup
)
DirectPlay2WImpl_CreateGroup
,
XCAST
(
CreatePlayer
)
DirectPlay2WImpl_CreatePlayer
,
XCAST
(
DeletePlayerFromGroup
)
DirectPlay2WImpl_DeletePlayerFromGroup
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment