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
c7b12c10
Commit
c7b12c10
authored
Apr 20, 2012
by
Aric Stewart
Committed by
Alexandre Julliard
Apr 20, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
strmbase: Have BaseControlWindow use BaseDispatch.
parent
a37d4b79
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
25 additions
and
15 deletions
+25
-15
videorenderer.c
dlls/quartz/videorenderer.c
+1
-1
window.c
dlls/strmbase/window.c
+22
-14
strmbase.h
include/wine/strmbase.h
+2
-0
No files found.
dlls/quartz/videorenderer.c
View file @
c7b12c10
...
@@ -752,7 +752,7 @@ static ULONG WINAPI VideoRendererInner_Release(IUnknown * iface)
...
@@ -752,7 +752,7 @@ static ULONG WINAPI VideoRendererInner_Release(IUnknown * iface)
if
(
!
refCount
)
if
(
!
refCount
)
{
{
Base
WindowImpl_DoneWithWindow
(
&
This
->
baseControlWindow
.
base
Window
);
Base
ControlWindow_Destroy
(
&
This
->
baseControl
Window
);
PostThreadMessageW
(
This
->
ThreadID
,
WM_QUIT
,
0
,
0
);
PostThreadMessageW
(
This
->
ThreadID
,
WM_QUIT
,
0
,
0
);
WaitForSingleObject
(
This
->
hThread
,
INFINITE
);
WaitForSingleObject
(
This
->
hThread
,
INFINITE
);
CloseHandle
(
This
->
hThread
);
CloseHandle
(
This
->
hThread
);
...
...
dlls/strmbase/window.c
View file @
c7b12c10
...
@@ -208,6 +208,7 @@ HRESULT WINAPI BaseControlWindow_Init(BaseControlWindow *pControlWindow, const I
...
@@ -208,6 +208,7 @@ HRESULT WINAPI BaseControlWindow_Init(BaseControlWindow *pControlWindow, const I
hr
=
BaseWindow_Init
(
&
pControlWindow
->
baseWindow
,
pFuncsTable
);
hr
=
BaseWindow_Init
(
&
pControlWindow
->
baseWindow
,
pFuncsTable
);
if
(
SUCCEEDED
(
hr
))
if
(
SUCCEEDED
(
hr
))
{
{
BaseDispatch_Init
(
&
pControlWindow
->
baseDispatch
,
&
IID_IVideoWindow
);
pControlWindow
->
IVideoWindow_iface
.
lpVtbl
=
lpVtbl
;
pControlWindow
->
IVideoWindow_iface
.
lpVtbl
=
lpVtbl
;
pControlWindow
->
AutoShow
=
TRUE
;
pControlWindow
->
AutoShow
=
TRUE
;
pControlWindow
->
hwndDrain
=
NULL
;
pControlWindow
->
hwndDrain
=
NULL
;
...
@@ -219,40 +220,47 @@ HRESULT WINAPI BaseControlWindow_Init(BaseControlWindow *pControlWindow, const I
...
@@ -219,40 +220,47 @@ HRESULT WINAPI BaseControlWindow_Init(BaseControlWindow *pControlWindow, const I
return
hr
;
return
hr
;
}
}
HRESULT
WINAPI
BaseControlWindow
Impl_GetTypeInfoCount
(
IVideoWindow
*
iface
,
UINT
*
pctinfo
)
HRESULT
WINAPI
BaseControlWindow
_Destroy
(
BaseControlWindow
*
pControlWindow
)
{
{
BaseControlWindow
*
This
=
impl_from_IVideoWindow
(
iface
);
BaseWindowImpl_DoneWithWindow
(
&
pControlWindow
->
baseWindow
);
return
BaseDispatch_Destroy
(
&
pControlWindow
->
baseDispatch
);
}
FIXME
(
"(%p/%p)->(%p): stub !!!
\n
"
,
This
,
iface
,
pctinfo
);
HRESULT
WINAPI
BaseControlWindowImpl_GetTypeInfoCount
(
IVideoWindow
*
iface
,
UINT
*
pctinfo
)
{
BaseControlWindow
*
This
=
impl_from_IVideoWindow
(
iface
);
return
S_OK
;
return
BaseDispatchImpl_GetTypeInfoCount
(
&
This
->
baseDispatch
,
pctinfo
)
;
}
}
HRESULT
WINAPI
BaseControlWindowImpl_GetTypeInfo
(
IVideoWindow
*
iface
,
UINT
iTInfo
,
LCID
lcid
,
ITypeInfo
**
ppTInfo
)
HRESULT
WINAPI
BaseControlWindowImpl_GetTypeInfo
(
IVideoWindow
*
iface
,
UINT
iTInfo
,
LCID
lcid
,
ITypeInfo
**
ppTInfo
)
{
{
BaseControlWindow
*
This
=
impl_from_IVideoWindow
(
iface
);
BaseControlWindow
*
This
=
impl_from_IVideoWindow
(
iface
);
FIXME
(
"(%p/%p)->(%d, %d, %p): stub !!!
\n
"
,
This
,
iface
,
iTInfo
,
lcid
,
ppTInfo
);
return
BaseDispatchImpl_GetTypeInfo
(
&
This
->
baseDispatch
,
&
IID_NULL
,
iTInfo
,
lcid
,
ppTInfo
);
return
S_OK
;
}
}
HRESULT
WINAPI
BaseControlWindowImpl_GetIDsOfNames
(
IVideoWindow
*
iface
,
REFIID
riid
,
LPOLESTR
*
rgszNames
,
UINT
cNames
,
LCID
lcid
,
DISPID
*
rgDispId
)
HRESULT
WINAPI
BaseControlWindowImpl_GetIDsOfNames
(
IVideoWindow
*
iface
,
REFIID
riid
,
LPOLESTR
*
rgszNames
,
UINT
cNames
,
LCID
lcid
,
DISPID
*
rgDispId
)
{
{
BaseControlWindow
*
This
=
impl_from_IVideoWindow
(
iface
);
BaseControlWindow
*
This
=
impl_from_IVideoWindow
(
iface
);
FIXME
(
"(%p/%p)->(%s (%p), %p, %d, %d, %p): stub !!!
\n
"
,
This
,
iface
,
debugstr_guid
(
riid
),
riid
,
rgszNames
,
cNames
,
lcid
,
rgDispId
);
return
BaseDispatchImpl_GetIDsOfNames
(
&
This
->
baseDispatch
,
riid
,
rgszNames
,
cNames
,
lcid
,
rgDispId
);
return
S_OK
;
}
}
HRESULT
WINAPI
BaseControlWindowImpl_Invoke
(
IVideoWindow
*
iface
,
DISPID
dispIdMember
,
REFIID
riid
,
LCID
lcid
,
WORD
wFlags
,
DISPPARAMS
*
pDispParams
,
VARIANT
*
pVarResult
,
EXCEPINFO
*
pExepInfo
,
UINT
*
puArgErr
)
HRESULT
WINAPI
BaseControlWindowImpl_Invoke
(
IVideoWindow
*
iface
,
DISPID
dispIdMember
,
REFIID
riid
,
LCID
lcid
,
WORD
wFlags
,
DISPPARAMS
*
pDispParams
,
VARIANT
*
pVarResult
,
EXCEPINFO
*
pExepInfo
,
UINT
*
puArgErr
)
{
{
BaseControlWindow
*
This
=
impl_from_IVideoWindow
(
iface
);
BaseControlWindow
*
This
=
impl_from_IVideoWindow
(
iface
);
HRESULT
hr
=
S_OK
;
ITypeInfo
*
pTypeInfo
;
FIXME
(
"(%p/%p)->(%d, %s (%p), %d, %04x, %p, %p, %p, %p): stub !!!
\n
"
,
This
,
iface
,
dispIdMember
,
debugstr_guid
(
riid
),
riid
,
lcid
,
wFlags
,
pDispParams
,
pVarResult
,
pExepInfo
,
puArgErr
);
hr
=
BaseDispatchImpl_GetTypeInfo
(
&
This
->
baseDispatch
,
riid
,
1
,
lcid
,
&
pTypeInfo
);
if
(
SUCCEEDED
(
hr
))
{
hr
=
ITypeInfo_Invoke
(
pTypeInfo
,
&
This
->
IVideoWindow_iface
,
dispIdMember
,
wFlags
,
pDispParams
,
pVarResult
,
pExepInfo
,
puArgErr
);
ITypeInfo_Release
(
pTypeInfo
);
}
return
S_OK
;
return
hr
;
}
}
HRESULT
WINAPI
BaseControlWindowImpl_put_Caption
(
IVideoWindow
*
iface
,
BSTR
strCaption
)
HRESULT
WINAPI
BaseControlWindowImpl_put_Caption
(
IVideoWindow
*
iface
,
BSTR
strCaption
)
...
...
include/wine/strmbase.h
View file @
c7b12c10
...
@@ -418,6 +418,7 @@ typedef struct tagBaseControlWindow
...
@@ -418,6 +418,7 @@ typedef struct tagBaseControlWindow
{
{
BaseWindow
baseWindow
;
BaseWindow
baseWindow
;
IVideoWindow
IVideoWindow_iface
;
IVideoWindow
IVideoWindow_iface
;
BaseDispatch
baseDispatch
;
BOOL
AutoShow
;
BOOL
AutoShow
;
HWND
hwndDrain
;
HWND
hwndDrain
;
...
@@ -428,6 +429,7 @@ typedef struct tagBaseControlWindow
...
@@ -428,6 +429,7 @@ typedef struct tagBaseControlWindow
}
BaseControlWindow
;
}
BaseControlWindow
;
HRESULT
WINAPI
BaseControlWindow_Init
(
BaseControlWindow
*
pControlWindow
,
const
IVideoWindowVtbl
*
lpVtbl
,
BaseFilter
*
owner
,
CRITICAL_SECTION
*
lock
,
BasePin
*
pPin
,
const
BaseWindowFuncTable
*
pFuncsTable
);
HRESULT
WINAPI
BaseControlWindow_Init
(
BaseControlWindow
*
pControlWindow
,
const
IVideoWindowVtbl
*
lpVtbl
,
BaseFilter
*
owner
,
CRITICAL_SECTION
*
lock
,
BasePin
*
pPin
,
const
BaseWindowFuncTable
*
pFuncsTable
);
HRESULT
WINAPI
BaseControlWindow_Destroy
(
BaseControlWindow
*
pControlWindow
);
BOOL
WINAPI
BaseControlWindowImpl_PossiblyEatMessage
(
BaseWindow
*
This
,
UINT
uMsg
,
WPARAM
wParam
,
LPARAM
lParam
);
BOOL
WINAPI
BaseControlWindowImpl_PossiblyEatMessage
(
BaseWindow
*
This
,
UINT
uMsg
,
WPARAM
wParam
,
LPARAM
lParam
);
HRESULT
WINAPI
BaseControlWindowImpl_GetTypeInfoCount
(
IVideoWindow
*
iface
,
UINT
*
pctinfo
);
HRESULT
WINAPI
BaseControlWindowImpl_GetTypeInfoCount
(
IVideoWindow
*
iface
,
UINT
*
pctinfo
);
...
...
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