Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
d3cd3ebc
Commit
d3cd3ebc
authored
Aug 25, 2021
by
Zebediah Figura
Committed by
Alexandre Julliard
Aug 26, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
qcap: Always return S_FALSE from DllCanUnloadNow().
Signed-off-by:
Zebediah Figura
<
zfigura@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
9a4a722f
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
0 additions
and
32 deletions
+0
-32
avimux.c
dlls/qcap/avimux.c
+0
-2
capturegraph.c
dlls/qcap/capturegraph.c
+0
-2
qcap_main.c
dlls/qcap/qcap_main.c
+0
-24
qcap_private.h
dlls/qcap/qcap_private.h
+0
-2
vfwcapture.c
dlls/qcap/vfwcapture.c
+0
-2
No files found.
dlls/qcap/avimux.c
View file @
d3cd3ebc
...
@@ -131,7 +131,6 @@ static void avi_mux_destroy(struct strmbase_filter *iface)
...
@@ -131,7 +131,6 @@ static void avi_mux_destroy(struct strmbase_filter *iface)
free
(
filter
->
idx1
);
free
(
filter
->
idx1
);
strmbase_filter_cleanup
(
&
filter
->
filter
);
strmbase_filter_cleanup
(
&
filter
->
filter
);
free
(
filter
);
free
(
filter
);
ObjectRefCount
(
FALSE
);
}
}
static
HRESULT
avi_mux_query_interface
(
struct
strmbase_filter
*
iface
,
REFIID
iid
,
void
**
out
)
static
HRESULT
avi_mux_query_interface
(
struct
strmbase_filter
*
iface
,
REFIID
iid
,
void
**
out
)
...
@@ -1851,7 +1850,6 @@ HRESULT avi_mux_create(IUnknown *outer, IUnknown **out)
...
@@ -1851,7 +1850,6 @@ HRESULT avi_mux_create(IUnknown *outer, IUnknown **out)
avimux
->
interleave
=
10000000
;
avimux
->
interleave
=
10000000
;
TRACE
(
"Created AVI mux %p.
\n
"
,
avimux
);
TRACE
(
"Created AVI mux %p.
\n
"
,
avimux
);
ObjectRefCount
(
TRUE
);
*
out
=
&
avimux
->
filter
.
IUnknown_inner
;
*
out
=
&
avimux
->
filter
.
IUnknown_inner
;
return
S_OK
;
return
S_OK
;
}
}
dlls/qcap/capturegraph.c
View file @
d3cd3ebc
...
@@ -66,7 +66,6 @@ HRESULT capture_graph_create(IUnknown *outer, IUnknown **out)
...
@@ -66,7 +66,6 @@ HRESULT capture_graph_create(IUnknown *outer, IUnknown **out)
object
->
csFilter
.
DebugInfo
->
Spare
[
0
]
=
(
DWORD_PTR
)(
__FILE__
": CaptureGraphImpl.csFilter"
);
object
->
csFilter
.
DebugInfo
->
Spare
[
0
]
=
(
DWORD_PTR
)(
__FILE__
": CaptureGraphImpl.csFilter"
);
TRACE
(
"Created capture graph builder %p.
\n
"
,
object
);
TRACE
(
"Created capture graph builder %p.
\n
"
,
object
);
ObjectRefCount
(
TRUE
);
*
out
=
(
IUnknown
*
)
&
object
->
ICaptureGraphBuilder_iface
;
*
out
=
(
IUnknown
*
)
&
object
->
ICaptureGraphBuilder_iface
;
return
S_OK
;
return
S_OK
;
}
}
...
@@ -123,7 +122,6 @@ static ULONG WINAPI fnCaptureGraphBuilder2_Release(ICaptureGraphBuilder2 * iface
...
@@ -123,7 +122,6 @@ static ULONG WINAPI fnCaptureGraphBuilder2_Release(ICaptureGraphBuilder2 * iface
if
(
This
->
mygraph
)
if
(
This
->
mygraph
)
IGraphBuilder_Release
(
This
->
mygraph
);
IGraphBuilder_Release
(
This
->
mygraph
);
free
(
This
);
free
(
This
);
ObjectRefCount
(
FALSE
);
}
}
return
ref
;
return
ref
;
}
}
...
...
dlls/qcap/qcap_main.c
View file @
d3cd3ebc
...
@@ -29,8 +29,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz);
...
@@ -29,8 +29,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz);
HINSTANCE
qcap_instance
;
HINSTANCE
qcap_instance
;
static
LONG
objects_ref
=
0
;
struct
class_factory
struct
class_factory
{
{
IClassFactory
IClassFactory_iface
;
IClassFactory
IClassFactory_iface
;
...
@@ -91,11 +89,6 @@ static HRESULT WINAPI class_factory_CreateInstance(IClassFactory *iface, IUnknow
...
@@ -91,11 +89,6 @@ static HRESULT WINAPI class_factory_CreateInstance(IClassFactory *iface, IUnknow
static
HRESULT
WINAPI
class_factory_LockServer
(
IClassFactory
*
iface
,
BOOL
lock
)
static
HRESULT
WINAPI
class_factory_LockServer
(
IClassFactory
*
iface
,
BOOL
lock
)
{
{
TRACE
(
"iface %p, lock %d.
\n
"
,
iface
,
lock
);
TRACE
(
"iface %p, lock %d.
\n
"
,
iface
,
lock
);
if
(
lock
)
InterlockedIncrement
(
&
objects_ref
);
else
InterlockedDecrement
(
&
objects_ref
);
return
S_OK
;
return
S_OK
;
}
}
...
@@ -274,20 +267,3 @@ HRESULT WINAPI DllUnregisterServer(void)
...
@@ -274,20 +267,3 @@ HRESULT WINAPI DllUnregisterServer(void)
IFilterMapper2_Release
(
mapper
);
IFilterMapper2_Release
(
mapper
);
return
S_OK
;
return
S_OK
;
}
}
/***********************************************************************
* DllCanUnloadNow (QCAP.@)
*/
HRESULT
WINAPI
DllCanUnloadNow
(
void
)
{
TRACE
(
".
\n
"
);
return
objects_ref
?
S_FALSE
:
S_OK
;
}
DWORD
ObjectRefCount
(
BOOL
increment
)
{
if
(
increment
)
return
InterlockedIncrement
(
&
objects_ref
);
return
InterlockedDecrement
(
&
objects_ref
);
}
dlls/qcap/qcap_private.h
View file @
d3cd3ebc
...
@@ -30,8 +30,6 @@
...
@@ -30,8 +30,6 @@
extern
HINSTANCE
qcap_instance
DECLSPEC_HIDDEN
;
extern
HINSTANCE
qcap_instance
DECLSPEC_HIDDEN
;
extern
DWORD
ObjectRefCount
(
BOOL
increment
)
DECLSPEC_HIDDEN
;
HRESULT
audio_record_create
(
IUnknown
*
outer
,
IUnknown
**
out
)
DECLSPEC_HIDDEN
;
HRESULT
audio_record_create
(
IUnknown
*
outer
,
IUnknown
**
out
)
DECLSPEC_HIDDEN
;
HRESULT
avi_compressor_create
(
IUnknown
*
outer
,
IUnknown
**
out
)
DECLSPEC_HIDDEN
;
HRESULT
avi_compressor_create
(
IUnknown
*
outer
,
IUnknown
**
out
)
DECLSPEC_HIDDEN
;
HRESULT
avi_mux_create
(
IUnknown
*
outer
,
IUnknown
**
out
)
DECLSPEC_HIDDEN
;
HRESULT
avi_mux_create
(
IUnknown
*
outer
,
IUnknown
**
out
)
DECLSPEC_HIDDEN
;
...
...
dlls/qcap/vfwcapture.c
View file @
d3cd3ebc
...
@@ -107,7 +107,6 @@ static void vfw_capture_destroy(struct strmbase_filter *iface)
...
@@ -107,7 +107,6 @@ static void vfw_capture_destroy(struct strmbase_filter *iface)
strmbase_source_cleanup
(
&
filter
->
source
);
strmbase_source_cleanup
(
&
filter
->
source
);
strmbase_filter_cleanup
(
&
filter
->
filter
);
strmbase_filter_cleanup
(
&
filter
->
filter
);
free
(
filter
);
free
(
filter
);
ObjectRefCount
(
FALSE
);
}
}
static
HRESULT
vfw_capture_query_interface
(
struct
strmbase_filter
*
iface
,
REFIID
iid
,
void
**
out
)
static
HRESULT
vfw_capture_query_interface
(
struct
strmbase_filter
*
iface
,
REFIID
iid
,
void
**
out
)
...
@@ -861,7 +860,6 @@ HRESULT vfw_capture_create(IUnknown *outer, IUnknown **out)
...
@@ -861,7 +860,6 @@ HRESULT vfw_capture_create(IUnknown *outer, IUnknown **out)
object
->
state_cs
.
DebugInfo
->
Spare
[
0
]
=
(
DWORD_PTR
)(
__FILE__
": vfw_capture.state_cs"
);
object
->
state_cs
.
DebugInfo
->
Spare
[
0
]
=
(
DWORD_PTR
)(
__FILE__
": vfw_capture.state_cs"
);
TRACE
(
"Created VFW capture filter %p.
\n
"
,
object
);
TRACE
(
"Created VFW capture filter %p.
\n
"
,
object
);
ObjectRefCount
(
TRUE
);
*
out
=
&
object
->
filter
.
IUnknown_inner
;
*
out
=
&
object
->
filter
.
IUnknown_inner
;
return
S_OK
;
return
S_OK
;
}
}
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