Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Alexey Alyaev
wine
Commits
91ae663c
Commit
91ae663c
authored
11 years ago
by
Michael Stefaniuc
Committed by
Alexandre Julliard
11 years ago
Browse files
Options
Downloads
Patches
Plain Diff
dplayx: Use separate QueryInterface, AddRef and Release methods for IDirectPlayLobby3 + 3A.
parent
9f10f092
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
dlls/dplayx/dplobby.c
+52
-29
52 additions, 29 deletions
dlls/dplayx/dplobby.c
with
52 additions
and
29 deletions
dlls/dplayx/dplobby.c
+
52
−
29
View file @
91ae663c
...
@@ -93,6 +93,11 @@ typedef struct IDirectPlayLobbyImpl
...
@@ -93,6 +93,11 @@ typedef struct IDirectPlayLobbyImpl
DirectPlayLobbyData
*
dpl
;
DirectPlayLobbyData
*
dpl
;
}
IDirectPlayLobbyImpl
;
}
IDirectPlayLobbyImpl
;
static
inline
IDirectPlayLobbyImpl
*
impl_from_IDirectPlayLobby3
(
IDirectPlayLobby3
*
iface
)
{
return
(
IDirectPlayLobbyImpl
*
)
iface
;
/* What you gonna do? */
}
static
inline
IDirectPlayLobbyImpl
*
impl_from_IDirectPlayLobby3A
(
IDirectPlayLobby3A
*
iface
)
static
inline
IDirectPlayLobbyImpl
*
impl_from_IDirectPlayLobby3A
(
IDirectPlayLobby3A
*
iface
)
{
{
return
(
IDirectPlayLobbyImpl
*
)
iface
;
/* What you gonna do? */
return
(
IDirectPlayLobbyImpl
*
)
iface
;
/* What you gonna do? */
...
@@ -230,12 +235,8 @@ HRESULT DPL_CreateInterface
...
@@ -230,12 +235,8 @@ HRESULT DPL_CreateInterface
return
DPERR_NOMEMORY
;
return
DPERR_NOMEMORY
;
}
}
static
HRESULT
WINAPI
DPL_QueryInterface
static
HRESULT
WINAPI
DPL_QueryInterface
(
IDirectPlayLobbyImpl
*
This
,
REFIID
riid
,
void
**
ppvObj
)
(
LPDIRECTPLAYLOBBYA
iface
,
REFIID
riid
,
LPVOID
*
ppvObj
)
{
{
IDirectPlayLobbyAImpl
*
This
=
(
IDirectPlayLobbyAImpl
*
)
iface
;
TRACE
(
"(%p)->(%s,%p)
\n
"
,
This
,
debugstr_guid
(
riid
),
ppvObj
);
TRACE
(
"(%p)->(%s,%p)
\n
"
,
This
,
debugstr_guid
(
riid
),
ppvObj
);
*
ppvObj
=
HeapAlloc
(
GetProcessHeap
(),
HEAP_ZERO_MEMORY
,
*
ppvObj
=
HeapAlloc
(
GetProcessHeap
(),
HEAP_ZERO_MEMORY
,
...
@@ -279,11 +280,9 @@ static HRESULT WINAPI DPL_QueryInterface
...
@@ -279,11 +280,9 @@ static HRESULT WINAPI DPL_QueryInterface
* Simple procedure. Just increment the reference count to this
* Simple procedure. Just increment the reference count to this
* structure and return the new reference count.
* structure and return the new reference count.
*/
*/
static
ULONG
WINAPI
DPL_AddRef
static
ULONG
WINAPI
DPL_AddRef
(
IDirectPlayLobbyImpl
*
This
)
(
LPDIRECTPLAYLOBBY
iface
)
{
{
ULONG
ulInterfaceRefCount
,
ulObjRefCount
;
ULONG
ulInterfaceRefCount
,
ulObjRefCount
;
IDirectPlayLobbyWImpl
*
This
=
(
IDirectPlayLobbyWImpl
*
)
iface
;
ulObjRefCount
=
InterlockedIncrement
(
&
This
->
unk
->
ulObjRef
);
ulObjRefCount
=
InterlockedIncrement
(
&
This
->
unk
->
ulObjRef
);
ulInterfaceRefCount
=
InterlockedIncrement
(
&
This
->
ulInterfaceRef
);
ulInterfaceRefCount
=
InterlockedIncrement
(
&
This
->
ulInterfaceRef
);
...
@@ -299,11 +298,9 @@ static ULONG WINAPI DPL_AddRef
...
@@ -299,11 +298,9 @@ static ULONG WINAPI DPL_AddRef
* If the object no longer has any reference counts, free up the associated
* If the object no longer has any reference counts, free up the associated
* memory.
* memory.
*/
*/
static
ULONG
WINAPI
DPL_Release
static
ULONG
WINAPI
DPL_Release
(
IDirectPlayLobbyImpl
*
This
)
(
LPDIRECTPLAYLOBBYA
iface
)
{
{
ULONG
ulInterfaceRefCount
,
ulObjRefCount
;
ULONG
ulInterfaceRefCount
,
ulObjRefCount
;
IDirectPlayLobbyAImpl
*
This
=
(
IDirectPlayLobbyAImpl
*
)
iface
;
ulObjRefCount
=
InterlockedDecrement
(
&
This
->
unk
->
ulObjRef
);
ulObjRefCount
=
InterlockedDecrement
(
&
This
->
unk
->
ulObjRef
);
ulInterfaceRefCount
=
InterlockedDecrement
(
&
This
->
ulInterfaceRef
);
ulInterfaceRefCount
=
InterlockedDecrement
(
&
This
->
ulInterfaceRef
);
...
@@ -326,6 +323,44 @@ static ULONG WINAPI DPL_Release
...
@@ -326,6 +323,44 @@ static ULONG WINAPI DPL_Release
return
ulInterfaceRefCount
;
return
ulInterfaceRefCount
;
}
}
static
HRESULT
WINAPI
IDirectPlayLobby3AImpl_QueryInterface
(
IDirectPlayLobby3A
*
iface
,
REFIID
riid
,
void
**
ppv
)
{
IDirectPlayLobbyImpl
*
This
=
impl_from_IDirectPlayLobby3A
(
iface
);
return
DPL_QueryInterface
(
This
,
riid
,
ppv
);
}
static
HRESULT
WINAPI
IDirectPlayLobby3Impl_QueryInterface
(
IDirectPlayLobby3
*
iface
,
REFIID
riid
,
void
**
ppv
)
{
IDirectPlayLobbyImpl
*
This
=
impl_from_IDirectPlayLobby3
(
iface
);
return
DPL_QueryInterface
(
This
,
riid
,
ppv
);
}
static
ULONG
WINAPI
IDirectPlayLobby3AImpl_AddRef
(
IDirectPlayLobby3A
*
iface
)
{
IDirectPlayLobbyImpl
*
This
=
impl_from_IDirectPlayLobby3A
(
iface
);
return
DPL_AddRef
(
This
);
}
static
ULONG
WINAPI
IDirectPlayLobby3Impl_AddRef
(
IDirectPlayLobby3
*
iface
)
{
IDirectPlayLobbyImpl
*
This
=
impl_from_IDirectPlayLobby3
(
iface
);
return
DPL_AddRef
(
This
);
}
static
ULONG
WINAPI
IDirectPlayLobby3AImpl_Release
(
IDirectPlayLobby3A
*
iface
)
{
IDirectPlayLobbyImpl
*
This
=
impl_from_IDirectPlayLobby3A
(
iface
);
return
DPL_Release
(
This
);
}
static
ULONG
WINAPI
IDirectPlayLobby3Impl_Release
(
IDirectPlayLobby3
*
iface
)
{
IDirectPlayLobbyImpl
*
This
=
impl_from_IDirectPlayLobby3
(
iface
);
return
DPL_Release
(
This
);
}
/********************************************************************
/********************************************************************
*
*
...
@@ -1552,21 +1587,11 @@ static HRESULT WINAPI IDirectPlayLobby3AImpl_WaitForConnectionSettings
...
@@ -1552,21 +1587,11 @@ static HRESULT WINAPI IDirectPlayLobby3AImpl_WaitForConnectionSettings
}
}
/* Direct Play Lobby 3 (ascii) Virtual Table for methods */
/* Note: Hack so we can reuse the old functions without compiler warnings */
#if !defined(__STRICT_ANSI__) && defined(__GNUC__)
# define XCAST(fun) (typeof(directPlayLobby3AVT.fun))
#else
# define XCAST(fun) (void*)
#endif
static
const
IDirectPlayLobby3Vtbl
directPlayLobby3AVT
=
static
const
IDirectPlayLobby3Vtbl
directPlayLobby3AVT
=
{
{
XCAST
(
QueryInterface
)
DPL_QueryInterface
,
IDirectPlayLobby3AImpl_QueryInterface
,
XCAST
(
AddRef
)
DPL_AddRef
,
IDirectPlayLobby3AImpl_AddRef
,
XCAST
(
Release
)
DPL_Release
,
IDirectPlayLobby3AImpl_Release
,
IDirectPlayLobby3AImpl_Connect
,
IDirectPlayLobby3AImpl_Connect
,
IDirectPlayLobby3AImpl_CreateAddress
,
IDirectPlayLobby3AImpl_CreateAddress
,
IDirectPlayLobby3AImpl_EnumAddress
,
IDirectPlayLobby3AImpl_EnumAddress
,
...
@@ -1584,7 +1609,6 @@ static const IDirectPlayLobby3Vtbl directPlayLobby3AVT =
...
@@ -1584,7 +1609,6 @@ static const IDirectPlayLobby3Vtbl directPlayLobby3AVT =
IDirectPlayLobby3AImpl_UnregisterApplication
,
IDirectPlayLobby3AImpl_UnregisterApplication
,
IDirectPlayLobby3AImpl_WaitForConnectionSettings
IDirectPlayLobby3AImpl_WaitForConnectionSettings
};
};
#undef XCAST
/* Direct Play Lobby 3 (unicode) Virtual Table for methods */
/* Direct Play Lobby 3 (unicode) Virtual Table for methods */
...
@@ -1597,10 +1621,9 @@ static const IDirectPlayLobby3Vtbl directPlayLobby3AVT =
...
@@ -1597,10 +1621,9 @@ static const IDirectPlayLobby3Vtbl directPlayLobby3AVT =
static
const
IDirectPlayLobby3Vtbl
directPlayLobby3WVT
=
static
const
IDirectPlayLobby3Vtbl
directPlayLobby3WVT
=
{
{
XCAST
(
QueryInterface
)
DPL_QueryInterface
,
IDirectPlayLobby3Impl_QueryInterface
,
XCAST
(
AddRef
)
DPL_AddRef
,
IDirectPlayLobby3Impl_AddRef
,
XCAST
(
Release
)
DPL_Release
,
IDirectPlayLobby3Impl_Release
,
IDirectPlayLobby3Impl_Connect
,
IDirectPlayLobby3Impl_Connect
,
XCAST
(
CreateAddress
)
IDirectPlayLobbyWImpl_CreateAddress
,
XCAST
(
CreateAddress
)
IDirectPlayLobbyWImpl_CreateAddress
,
XCAST
(
EnumAddress
)
IDirectPlayLobbyWImpl_EnumAddress
,
XCAST
(
EnumAddress
)
IDirectPlayLobbyWImpl_EnumAddress
,
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment