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
98143898
Commit
98143898
authored
Mar 11, 2020
by
Zebediah Figura
Committed by
Alexandre Julliard
Mar 12, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
qedit: Pass an IUnknown pointer to the object creation functions.
Signed-off-by:
Zebediah Figura
<
z.figura12@gmail.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
ed0f2909
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
17 additions
and
16 deletions
+17
-16
main.c
dlls/qedit/main.c
+8
-8
mediadet.c
dlls/qedit/mediadet.c
+2
-1
nullrenderer.c
dlls/qedit/nullrenderer.c
+1
-1
qedit_private.h
dlls/qedit/qedit_private.h
+4
-4
samplegrabber.c
dlls/qedit/samplegrabber.c
+1
-1
timeline.c
dlls/qedit/timeline.c
+1
-1
No files found.
dlls/qedit/main.c
View file @
98143898
...
...
@@ -42,7 +42,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv)
typedef
struct
{
IClassFactory
IClassFactory_iface
;
LONG
ref
;
HRESULT
(
*
pfnCreateInstance
)(
IUnknown
*
pUnkOuter
,
LPVOID
*
ppObj
);
HRESULT
(
*
create_instance
)(
IUnknown
*
outer
,
IUnknown
**
out
);
}
IClassFactoryImpl
;
static
inline
IClassFactoryImpl
*
impl_from_IClassFactory
(
IClassFactory
*
iface
)
...
...
@@ -53,15 +53,15 @@ static inline IClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface)
struct
object_creation_info
{
const
CLSID
*
clsid
;
HRESULT
(
*
pfnCreateInstance
)(
IUnknown
*
pUnkOuter
,
LPVOID
*
ppObj
);
HRESULT
(
*
create_instance
)(
IUnknown
*
outer
,
IUnknown
**
out
);
};
static
const
struct
object_creation_info
object_creation
[]
=
{
{
&
CLSID_AMTimeline
,
AMTimeline_create
},
{
&
CLSID_MediaDet
,
MediaDet_create
},
{
&
CLSID_NullRenderer
,
NullRenderer_create
},
{
&
CLSID_SampleGrabber
,
SampleGrabber_create
},
{
&
CLSID_AMTimeline
,
timeline_create
},
{
&
CLSID_MediaDet
,
media_detector_create
},
{
&
CLSID_NullRenderer
,
null_renderer_create
},
{
&
CLSID_SampleGrabber
,
sample_grabber_create
},
};
static
HRESULT
WINAPI
DSCF_QueryInterface
(
IClassFactory
*
iface
,
REFIID
riid
,
void
**
ppobj
)
...
...
@@ -109,7 +109,7 @@ static HRESULT WINAPI DSCF_CreateInstance(IClassFactory *iface, IUnknown *pOuter
if
(
pOuter
&&
!
IsEqualGUID
(
&
IID_IUnknown
,
riid
))
return
E_NOINTERFACE
;
hres
=
This
->
pfnCreateInstance
(
pOuter
,
(
LPVOID
*
)
&
punk
);
hres
=
This
->
create_instance
(
pOuter
,
&
punk
);
if
(
SUCCEEDED
(
hres
))
{
hres
=
IUnknown_QueryInterface
(
punk
,
riid
,
ppobj
);
IUnknown_Release
(
punk
);
...
...
@@ -186,7 +186,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
factory
->
IClassFactory_iface
.
lpVtbl
=
&
DSCF_Vtbl
;
factory
->
ref
=
1
;
factory
->
pfnCreateInstance
=
object_creation
[
i
].
pfnCreateI
nstance
;
factory
->
create_instance
=
object_creation
[
i
].
create_i
nstance
;
*
ppv
=
&
factory
->
IClassFactory_iface
;
return
S_OK
;
...
...
dlls/qedit/mediadet.c
View file @
98143898
...
...
@@ -637,7 +637,8 @@ static const IMediaDetVtbl IMediaDet_VTable =
MediaDet_EnterBitmapGrabMode
,
};
HRESULT
MediaDet_create
(
IUnknown
*
pUnkOuter
,
LPVOID
*
ppv
)
{
HRESULT
media_detector_create
(
IUnknown
*
pUnkOuter
,
IUnknown
**
ppv
)
{
MediaDetImpl
*
obj
=
NULL
;
TRACE
(
"(%p,%p)
\n
"
,
pUnkOuter
,
ppv
);
...
...
dlls/qedit/nullrenderer.c
View file @
98143898
...
...
@@ -62,7 +62,7 @@ static const struct strmbase_renderer_ops renderer_ops =
.
renderer_destroy
=
null_renderer_destroy
,
};
HRESULT
NullRenderer_create
(
IUnknown
*
outer
,
void
**
out
)
HRESULT
null_renderer_create
(
IUnknown
*
outer
,
IUnknown
**
out
)
{
HRESULT
hr
;
NullRendererImpl
*
pNullRenderer
;
...
...
dlls/qedit/qedit_private.h
View file @
98143898
...
...
@@ -33,9 +33,9 @@
#include "dshow.h"
#include "qedit.h"
HRESULT
AMTimeline_create
(
IUnknown
*
pUnkOuter
,
LPVOID
*
ppObj
)
DECLSPEC_HIDDEN
;
HRESULT
MediaDet_create
(
IUnknown
*
pUnkOuter
,
LPVOID
*
ppObj
)
DECLSPEC_HIDDEN
;
HRESULT
NullRenderer_create
(
IUnknown
*
outer
,
void
**
out
)
DECLSPEC_HIDDEN
;
HRESULT
SampleGrabber_create
(
IUnknown
*
pUnkOuter
,
LPVOID
*
ppObj
)
DECLSPEC_HIDDEN
;
HRESULT
timeline_create
(
IUnknown
*
outer
,
IUnknown
**
out
)
DECLSPEC_HIDDEN
;
HRESULT
media_detector_create
(
IUnknown
*
outer
,
IUnknown
**
out
)
DECLSPEC_HIDDEN
;
HRESULT
null_renderer_create
(
IUnknown
*
outer
,
IUnknown
**
out
)
DECLSPEC_HIDDEN
;
HRESULT
sample_grabber_create
(
IUnknown
*
outer
,
IUnknown
**
out
)
DECLSPEC_HIDDEN
;
#endif
/* __QEDIT_PRIVATE_INCLUDED__ */
dlls/qedit/samplegrabber.c
View file @
98143898
...
...
@@ -634,7 +634,7 @@ static const struct strmbase_source_ops source_ops =
.
pfnDecideAllocator
=
sample_grabber_source_DecideAllocator
,
};
HRESULT
SampleGrabber_create
(
IUnknown
*
outer
,
void
**
out
)
HRESULT
sample_grabber_create
(
IUnknown
*
outer
,
IUnknown
**
out
)
{
SG_Impl
*
obj
=
NULL
;
ISeekingPassThru
*
passthru
;
...
...
dlls/qedit/timeline.c
View file @
98143898
...
...
@@ -421,7 +421,7 @@ static const IAMTimelineVtbl IAMTimeline_VTable =
Timeline_IAMTimeline_GetDefaultEffectB
,
};
HRESULT
AMTimeline_create
(
IUnknown
*
pUnkOuter
,
LPVOID
*
ppv
)
HRESULT
timeline_create
(
IUnknown
*
pUnkOuter
,
IUnknown
*
*
ppv
)
{
TimelineImpl
*
obj
=
NULL
;
...
...
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