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
Zsolt Vadász
wine
Commits
caefc340
Commit
caefc340
authored
18 years ago
by
Robert Shearman
Committed by
Alexandre Julliard
18 years ago
Browse files
Options
Downloads
Patches
Plain Diff
ole32: Add a class factory for composite monikers.
parent
fa8472c3
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
dlls/ole32/compositemoniker.c
+68
-1
68 additions, 1 deletion
dlls/ole32/compositemoniker.c
dlls/ole32/moniker.h
+2
-0
2 additions, 0 deletions
dlls/ole32/moniker.h
dlls/ole32/oleproxy.c
+2
-0
2 additions, 0 deletions
dlls/ole32/oleproxy.c
with
72 additions
and
1 deletion
dlls/ole32/compositemoniker.c
+
68
−
1
View file @
caefc340
...
...
@@ -37,7 +37,7 @@
WINE_DEFAULT_DEBUG_CHANNEL
(
ole
);
static
const
CLSID
CLSID_CompositeMoniker
=
{
const
CLSID
CLSID_CompositeMoniker
=
{
0x309
,
0
,
0
,
{
0xC0
,
0
,
0
,
0
,
0
,
0
,
0
,
0x46
}
};
...
...
@@ -1944,3 +1944,70 @@ MonikerCommonPrefixWith(IMoniker* pmkThis,IMoniker* pmkOther,IMoniker** ppmkComm
FIXME
(
"(),stub!
\n
"
);
return
E_NOTIMPL
;
}
static
HRESULT
WINAPI
CompositeMonikerCF_QueryInterface
(
LPCLASSFACTORY
iface
,
REFIID
riid
,
LPVOID
*
ppv
)
{
*
ppv
=
NULL
;
if
(
IsEqualIID
(
riid
,
&
IID_IUnknown
)
||
IsEqualIID
(
riid
,
&
IID_IClassFactory
))
{
*
ppv
=
iface
;
IUnknown_AddRef
(
iface
);
return
S_OK
;
}
return
E_NOINTERFACE
;
}
static
ULONG
WINAPI
CompositeMonikerCF_AddRef
(
LPCLASSFACTORY
iface
)
{
return
2
;
/* non-heap based object */
}
static
ULONG
WINAPI
CompositeMonikerCF_Release
(
LPCLASSFACTORY
iface
)
{
return
1
;
/* non-heap based object */
}
static
HRESULT
WINAPI
CompositeMonikerCF_CreateInstance
(
LPCLASSFACTORY
iface
,
LPUNKNOWN
pUnk
,
REFIID
riid
,
LPVOID
*
ppv
)
{
CompositeMonikerImpl
*
newCompositeMoniker
;
HRESULT
hr
;
TRACE
(
"(%p, %s, %p)
\n
"
,
pUnk
,
debugstr_guid
(
riid
),
ppv
);
*
ppv
=
NULL
;
if
(
pUnk
)
return
CLASS_E_NOAGGREGATION
;
hr
=
CompositeMonikerImpl_Construct
(
&
newCompositeMoniker
,
NULL
,
NULL
);
if
(
SUCCEEDED
(
hr
))
hr
=
CompositeMonikerImpl_QueryInterface
((
IMoniker
*
)
newCompositeMoniker
,
riid
,
ppv
);
if
(
FAILED
(
hr
))
HeapFree
(
GetProcessHeap
(),
0
,
newCompositeMoniker
);
return
hr
;
}
static
HRESULT
WINAPI
CompositeMonikerCF_LockServer
(
LPCLASSFACTORY
iface
,
BOOL
fLock
)
{
FIXME
(
"(%d), stub!
\n
"
,
fLock
);
return
S_OK
;
}
static
const
IClassFactoryVtbl
CompositeMonikerCFVtbl
=
{
CompositeMonikerCF_QueryInterface
,
CompositeMonikerCF_AddRef
,
CompositeMonikerCF_Release
,
CompositeMonikerCF_CreateInstance
,
CompositeMonikerCF_LockServer
};
static
const
IClassFactoryVtbl
*
CompositeMonikerCF
=
&
CompositeMonikerCFVtbl
;
HRESULT
CompositeMonikerCF_Create
(
REFIID
riid
,
LPVOID
*
ppv
)
{
return
IClassFactory_QueryInterface
((
IClassFactory
*
)
&
CompositeMonikerCF
,
riid
,
ppv
);
}
This diff is collapsed.
Click to expand it.
dlls/ole32/moniker.h
+
2
−
0
View file @
caefc340
...
...
@@ -4,10 +4,12 @@
extern
const
CLSID
CLSID_FileMoniker
;
extern
const
CLSID
CLSID_ItemMoniker
;
extern
const
CLSID
CLSID_AntiMoniker
;
extern
const
CLSID
CLSID_CompositeMoniker
;
HRESULT
FileMonikerCF_Create
(
REFIID
riid
,
LPVOID
*
ppv
);
HRESULT
ItemMonikerCF_Create
(
REFIID
riid
,
LPVOID
*
ppv
);
HRESULT
AntiMonikerCF_Create
(
REFIID
riid
,
LPVOID
*
ppv
);
HRESULT
CompositeMonikerCF_Create
(
REFIID
riid
,
LPVOID
*
ppv
);
HRESULT
MonikerMarshal_Create
(
IMoniker
*
inner
,
IUnknown
**
outer
);
...
...
This diff is collapsed.
Click to expand it.
dlls/ole32/oleproxy.c
+
2
−
0
View file @
caefc340
...
...
@@ -1016,6 +1016,8 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid,LPVOID *ppv)
return
ItemMonikerCF_Create
(
iid
,
ppv
);
if
(
IsEqualCLSID
(
rclsid
,
&
CLSID_AntiMoniker
))
return
AntiMonikerCF_Create
(
iid
,
ppv
);
if
(
IsEqualCLSID
(
rclsid
,
&
CLSID_CompositeMoniker
))
return
CompositeMonikerCF_Create
(
iid
,
ppv
);
FIXME
(
"
\n\t
CLSID:
\t
%s,
\n\t
IID:
\t
%s
\n
"
,
debugstr_guid
(
rclsid
),
debugstr_guid
(
iid
));
return
CLASS_E_CLASSNOTAVAILABLE
;
...
...
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