[PATCH v2 1/4] qcap: Combine the internal header files.
Zebediah Figura
z.figura12 at gmail.com
Mon Jun 29 10:26:15 CDT 2020
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
---
dlls/qcap/audiorecord.c | 15 +--------
dlls/qcap/avico.c | 13 +-------
dlls/qcap/avimux.c | 14 +--------
dlls/qcap/capture.h | 42 --------------------------
dlls/qcap/capturegraph.c | 28 +----------------
dlls/qcap/filewriter.c | 6 +---
dlls/qcap/qcap_main.c | 23 ++------------
dlls/qcap/qcap_main.h | 36 ----------------------
dlls/qcap/qcap_private.h | 62 ++++++++++++++++++++++++++++++++++++++
dlls/qcap/smartteefilter.c | 15 +--------
dlls/qcap/v4l.c | 15 +--------
dlls/qcap/vfwcapture.c | 24 +--------------
12 files changed, 72 insertions(+), 221 deletions(-)
delete mode 100644 dlls/qcap/capture.h
delete mode 100644 dlls/qcap/qcap_main.h
create mode 100644 dlls/qcap/qcap_private.h
diff --git a/dlls/qcap/audiorecord.c b/dlls/qcap/audiorecord.c
index 48be64b63f..7477cca6d6 100644
--- a/dlls/qcap/audiorecord.c
+++ b/dlls/qcap/audiorecord.c
@@ -17,20 +17,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include <stdarg.h>
-
-#define COBJMACROS
-
-#include "windef.h"
-#include "winbase.h"
-#include "wtypes.h"
-#include "wingdi.h"
-#include "winuser.h"
-#include "dshow.h"
-
-#include "qcap_main.h"
-
-#include "wine/debug.h"
+#include "qcap_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(qcap);
diff --git a/dlls/qcap/avico.c b/dlls/qcap/avico.c
index fc5826b16f..7b3c1ea369 100644
--- a/dlls/qcap/avico.c
+++ b/dlls/qcap/avico.c
@@ -16,21 +16,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include <stdarg.h>
-
-#define COBJMACROS
-
-#include "windef.h"
-#include "winbase.h"
-#include "dshow.h"
+#include "qcap_private.h"
#include "vfw.h"
#include "aviriff.h"
-#include "qcap_main.h"
-
-#include "wine/debug.h"
-#include "wine/heap.h"
-
WINE_DEFAULT_DEBUG_CHANNEL(qcap);
typedef struct {
diff --git a/dlls/qcap/avimux.c b/dlls/qcap/avimux.c
index f1e703bfb6..ea73e42040 100644
--- a/dlls/qcap/avimux.c
+++ b/dlls/qcap/avimux.c
@@ -16,22 +16,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include <stdarg.h>
-#include <stdio.h>
-
-#define COBJMACROS
-
-#include "windef.h"
-#include "winbase.h"
-#include "wtypes.h"
-#include "dshow.h"
+#include "qcap_private.h"
#include "vfw.h"
#include "aviriff.h"
-#include "qcap_main.h"
-
-#include "wine/debug.h"
-
WINE_DEFAULT_DEBUG_CHANNEL(qcap);
#define MAX_PIN_NO 128
diff --git a/dlls/qcap/capture.h b/dlls/qcap/capture.h
deleted file mode 100644
index 615988bda3..0000000000
--- a/dlls/qcap/capture.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* DirectShow private capture header (QCAP.DLL)
- *
- * Copyright 2005 Maarten Lankhorst
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-#ifndef __QCAP_CAPTURE_H__
-#define __QCAP_CAPTURE_H__
-
-struct _Capture;
-typedef struct _Capture Capture;
-
-Capture *qcap_driver_init(struct strmbase_source *,USHORT) DECLSPEC_HIDDEN;
-HRESULT qcap_driver_destroy(Capture*) DECLSPEC_HIDDEN;
-HRESULT qcap_driver_check_format(Capture*,const AM_MEDIA_TYPE*) DECLSPEC_HIDDEN;
-HRESULT qcap_driver_set_format(Capture*,AM_MEDIA_TYPE*) DECLSPEC_HIDDEN;
-HRESULT qcap_driver_get_caps(Capture *device, LONG index, AM_MEDIA_TYPE **pmt,
- VIDEO_STREAM_CONFIG_CAPS *vscc) DECLSPEC_HIDDEN;
-LONG qcap_driver_get_caps_count(Capture *device) DECLSPEC_HIDDEN;
-HRESULT qcap_driver_get_format(const Capture*,AM_MEDIA_TYPE**) DECLSPEC_HIDDEN;
-HRESULT qcap_driver_get_prop_range(Capture*,VideoProcAmpProperty,LONG*,LONG*,LONG*,LONG*,LONG*) DECLSPEC_HIDDEN;
-HRESULT qcap_driver_get_prop(Capture*,VideoProcAmpProperty,LONG*,LONG*) DECLSPEC_HIDDEN;
-HRESULT qcap_driver_set_prop(Capture*,VideoProcAmpProperty,LONG,LONG) DECLSPEC_HIDDEN;
-void qcap_driver_init_stream(Capture *device) DECLSPEC_HIDDEN;
-void qcap_driver_start_stream(Capture *device) DECLSPEC_HIDDEN;
-void qcap_driver_stop_stream(Capture *device) DECLSPEC_HIDDEN;
-void qcap_driver_cleanup_stream(Capture *device) DECLSPEC_HIDDEN;
-
-#endif /* __QCAP_CAPTURE_H__ */
diff --git a/dlls/qcap/capturegraph.c b/dlls/qcap/capturegraph.c
index 822f68754e..b4f83956f0 100644
--- a/dlls/qcap/capturegraph.c
+++ b/dlls/qcap/capturegraph.c
@@ -17,34 +17,8 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "config.h"
-
-#include <stdio.h>
-#include <stdarg.h>
-
-#define COBJMACROS
-
-#include "windef.h"
-#include "winbase.h"
-#include "wingdi.h"
-#include "winerror.h"
-#include "objbase.h"
-
-#include "evcode.h"
-#include "strmif.h"
-#include "control.h"
-#include "vfwmsgs.h"
-/*
- *#include "amvideo.h"
- *#include "mmreg.h"
- *#include "dshow.h"
- *#include "ddraw.h"
- */
-#include "uuids.h"
-#include "qcap_main.h"
-#include "wine/unicode.h"
-#include "wine/debug.h"
+#include "qcap_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(qcap);
diff --git a/dlls/qcap/filewriter.c b/dlls/qcap/filewriter.c
index af148d4aa1..be1e4e773a 100644
--- a/dlls/qcap/filewriter.c
+++ b/dlls/qcap/filewriter.c
@@ -18,11 +18,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#define COBJMACROS
-#include "dshow.h"
-#include "qcap_main.h"
-#include "wine/debug.h"
-#include "wine/unicode.h"
+#include "qcap_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(qcap);
diff --git a/dlls/qcap/qcap_main.c b/dlls/qcap/qcap_main.c
index 00e0a9671f..411ef41ea2 100644
--- a/dlls/qcap/qcap_main.c
+++ b/dlls/qcap/qcap_main.c
@@ -19,28 +19,9 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "config.h"
-
-#include <assert.h>
-#include <stdio.h>
-#include <stdarg.h>
-
-#define COBJMACROS
-#define NONAMELESSSTRUCT
-#define NONAMELESSUNION
-#include "windef.h"
-#include "winbase.h"
-#include "wingdi.h"
-#include "winerror.h"
-#include "objbase.h"
-#include "uuids.h"
-#include "strmif.h"
-#include "rpcproxy.h"
-
-#include "qcap_main.h"
-#include "wine/unicode.h"
-#include "wine/debug.h"
+#include "qcap_private.h"
+#include "rpcproxy.h"
WINE_DEFAULT_DEBUG_CHANNEL(qcap);
diff --git a/dlls/qcap/qcap_main.h b/dlls/qcap/qcap_main.h
deleted file mode 100644
index 4197771c78..0000000000
--- a/dlls/qcap/qcap_main.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Qcap main header file
- *
- * Copyright (C) 2005 Rolf Kalbermatter
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-#ifndef _QCAP_MAIN_H_DEFINED
-#define _QCAP_MAIN_H_DEFINED
-
-#include "wine/heap.h"
-#include "wine/strmbase.h"
-
-extern DWORD ObjectRefCount(BOOL increment) DECLSPEC_HIDDEN;
-
-HRESULT audio_record_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 capture_graph_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN;
-HRESULT file_writer_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN;
-HRESULT smart_tee_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN;
-HRESULT vfw_capture_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN;
-
-#endif /* _QCAP_MAIN_H_DEFINED */
diff --git a/dlls/qcap/qcap_private.h b/dlls/qcap/qcap_private.h
new file mode 100644
index 0000000000..688bebb201
--- /dev/null
+++ b/dlls/qcap/qcap_private.h
@@ -0,0 +1,62 @@
+/*
+ * DirectShow capture
+ *
+ * Copyright (C) 2005 Rolf Kalbermatter
+ * Copyright 2005 Maarten Lankhorst
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+#ifndef _QCAP_PRIVATE_H_DEFINED
+#define _QCAP_PRIVATE_H_DEFINED
+
+#define COBJMACROS
+#define NONAMELESSSTRUCT
+#define NONAMELESSUNION
+#include "dshow.h"
+#include "wine/debug.h"
+#include "wine/heap.h"
+#include "wine/strmbase.h"
+#include "wine/unicode.h"
+
+extern DWORD ObjectRefCount(BOOL increment) DECLSPEC_HIDDEN;
+
+HRESULT audio_record_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 capture_graph_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN;
+HRESULT file_writer_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN;
+HRESULT smart_tee_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN;
+HRESULT vfw_capture_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN;
+
+typedef struct _Capture Capture;
+
+Capture *qcap_driver_init(struct strmbase_source *pin, USHORT card) DECLSPEC_HIDDEN;
+HRESULT qcap_driver_destroy(Capture *device) DECLSPEC_HIDDEN;
+HRESULT qcap_driver_check_format(Capture *device, const AM_MEDIA_TYPE *mt) DECLSPEC_HIDDEN;
+HRESULT qcap_driver_set_format(Capture *device, AM_MEDIA_TYPE *mt) DECLSPEC_HIDDEN;
+HRESULT qcap_driver_get_caps(Capture *device, LONG index, AM_MEDIA_TYPE **mt,
+ VIDEO_STREAM_CONFIG_CAPS *vscc) DECLSPEC_HIDDEN;
+LONG qcap_driver_get_caps_count(Capture *device) DECLSPEC_HIDDEN;
+HRESULT qcap_driver_get_format(const Capture *device, AM_MEDIA_TYPE **mt) DECLSPEC_HIDDEN;
+HRESULT qcap_driver_get_prop_range(Capture *device, VideoProcAmpProperty property,
+ LONG *min, LONG *max, LONG *step, LONG *default_value, LONG *flags) DECLSPEC_HIDDEN;
+HRESULT qcap_driver_get_prop(Capture *device, VideoProcAmpProperty property, LONG *value, LONG *flags) DECLSPEC_HIDDEN;
+HRESULT qcap_driver_set_prop(Capture *device, VideoProcAmpProperty property, LONG value, LONG flags) DECLSPEC_HIDDEN;
+void qcap_driver_init_stream(Capture *device) DECLSPEC_HIDDEN;
+void qcap_driver_start_stream(Capture *device) DECLSPEC_HIDDEN;
+void qcap_driver_stop_stream(Capture *device) DECLSPEC_HIDDEN;
+void qcap_driver_cleanup_stream(Capture *device) DECLSPEC_HIDDEN;
+
+#endif
diff --git a/dlls/qcap/smartteefilter.c b/dlls/qcap/smartteefilter.c
index 46ec09ca7e..5b4add0b5d 100644
--- a/dlls/qcap/smartteefilter.c
+++ b/dlls/qcap/smartteefilter.c
@@ -18,20 +18,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include <stdarg.h>
-
-#define COBJMACROS
-
-#include "windef.h"
-#include "winbase.h"
-#include "wtypes.h"
-#include "wingdi.h"
-#include "winuser.h"
-#include "dshow.h"
-
-#include "qcap_main.h"
-
-#include "wine/debug.h"
+#include "qcap_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(qcap);
diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c
index 449951ad53..a8841272a3 100644
--- a/dlls/qcap/v4l.c
+++ b/dlls/qcap/v4l.c
@@ -24,8 +24,6 @@
#include "config.h"
#include "wine/port.h"
-#define COBJMACROS
-
#include <stdarg.h>
#include <stdio.h>
#include <fcntl.h>
@@ -49,18 +47,7 @@
#include <unistd.h>
#endif
-#include "windef.h"
-#include "winbase.h"
-#include "wtypes.h"
-#include "wingdi.h"
-#include "winuser.h"
-#include "dshow.h"
-#include "vfwmsgs.h"
-#include "amvideo.h"
-#include "wine/debug.h"
-
-#include "qcap_main.h"
-#include "capture.h"
+#include "qcap_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(qcap);
diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c
index 9430533ea1..b48b2316d7 100644
--- a/dlls/qcap/vfwcapture.c
+++ b/dlls/qcap/vfwcapture.c
@@ -18,29 +18,7 @@
*
*/
-#define COBJMACROS
-
-#include "config.h"
-#include <stdarg.h>
-
-#include "windef.h"
-#include "winbase.h"
-#include "wtypes.h"
-#include "wingdi.h"
-#include "winuser.h"
-#include "dshow.h"
-
-#include "qcap_main.h"
-#include "wine/debug.h"
-
-#include "capture.h"
-#include "uuids.h"
-#include "vfwmsgs.h"
-#include "amvideo.h"
-#include "strmif.h"
-#include "ddraw.h"
-#include "ocidl.h"
-#include "oleauto.h"
+#include "qcap_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(qcap);
--
2.27.0
More information about the wine-devel
mailing list