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
Lorenzo Ferrillo
wine
Commits
39e80379
Commit
39e80379
authored
14 years ago
by
Michael Stefaniuc
Committed by
Alexandre Julliard
14 years ago
Browse files
Options
Downloads
Patches
Plain Diff
objsel: COM cleanup for the IClassFactory iface.
parent
1c35951f
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
dlls/objsel/factory.c
+8
-3
8 additions, 3 deletions
dlls/objsel/factory.c
dlls/objsel/objsel.c
+1
-1
1 addition, 1 deletion
dlls/objsel/objsel.c
dlls/objsel/objsel_private.h
+1
-1
1 addition, 1 deletion
dlls/objsel/objsel_private.h
with
10 additions
and
5 deletions
dlls/objsel/factory.c
+
8
−
3
View file @
39e80379
...
...
@@ -26,6 +26,11 @@
WINE_DEFAULT_DEBUG_CHANNEL
(
objsel
);
static
inline
ClassFactoryImpl
*
impl_from_IClassFactory
(
IClassFactory
*
iface
)
{
return
CONTAINING_RECORD
(
iface
,
ClassFactoryImpl
,
IClassFactory_iface
);
}
/**********************************************************************
* OBJSEL_IClassFactory_QueryInterface (also IUnknown)
*/
...
...
@@ -60,7 +65,7 @@ static HRESULT WINAPI OBJSEL_IClassFactory_QueryInterface(
*/
static
ULONG
WINAPI
OBJSEL_IClassFactory_AddRef
(
LPCLASSFACTORY
iface
)
{
ClassFactoryImpl
*
This
=
(
ClassFactory
Impl
*
)
iface
;
ClassFactoryImpl
*
This
=
impl_from_I
ClassFactory
(
iface
)
;
ULONG
ref
;
TRACE
(
"
\n
"
);
...
...
@@ -83,7 +88,7 @@ static ULONG WINAPI OBJSEL_IClassFactory_AddRef(LPCLASSFACTORY iface)
*/
static
ULONG
WINAPI
OBJSEL_IClassFactory_Release
(
LPCLASSFACTORY
iface
)
{
ClassFactoryImpl
*
This
=
(
ClassFactory
Impl
*
)
iface
;
ClassFactoryImpl
*
This
=
impl_from_I
ClassFactory
(
iface
)
;
ULONG
ref
;
TRACE
(
"
\n
"
);
...
...
@@ -160,4 +165,4 @@ static IClassFactoryVtbl IClassFactory_Vtbl =
* static ClassFactory instance
*/
ClassFactoryImpl
OBJSEL_ClassFactory
=
{
&
IClassFactory_Vtbl
,
0
};
ClassFactoryImpl
OBJSEL_ClassFactory
=
{
{
&
IClassFactory_Vtbl
}
,
0
};
This diff is collapsed.
Click to expand it.
dlls/objsel/objsel.c
+
1
−
1
View file @
39e80379
...
...
@@ -54,7 +54,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv)
*
ppv
=
NULL
;
if
(
IsEqualGUID
(
rclsid
,
&
CLSID_DsObjectPicker
))
return
IClassFactory_QueryInterface
(
(
IClassFactory
*
)
&
OBJSEL_ClassFactory
,
iid
,
ppv
);
return
IClassFactory_QueryInterface
(
&
OBJSEL_ClassFactory
.
IClassFactory_iface
,
iid
,
ppv
);
FIXME
(
"CLSID: %s, IID: %s
\n
"
,
debugstr_guid
(
rclsid
),
debugstr_guid
(
iid
));
return
CLASS_E_CLASSNOTAVAILABLE
;
...
...
This diff is collapsed.
Click to expand it.
dlls/objsel/objsel_private.h
+
1
−
1
View file @
39e80379
...
...
@@ -49,7 +49,7 @@ extern LONG dll_refs;
*/
typedef
struct
{
IClassFactory
Vtbl
*
lpVtbl
;
IClassFactory
IClassFactory_iface
;
LONG
ref
;
}
ClassFactoryImpl
;
...
...
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