[PATCH v2 4/7] qcap: Build with msvcrt.

Zebediah Figura z.figura12 at gmail.com
Thu Nov 26 22:34:33 CST 2020


Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
---
 dlls/qcap/Makefile.in    | 2 ++
 dlls/qcap/filewriter.c   | 4 ++--
 dlls/qcap/qcap_private.h | 1 -
 dlls/qcap/v4l.c          | 1 +
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/dlls/qcap/Makefile.in b/dlls/qcap/Makefile.in
index a3b6ba78fb9..298274accc6 100644
--- a/dlls/qcap/Makefile.in
+++ b/dlls/qcap/Makefile.in
@@ -3,6 +3,8 @@ IMPORTS   = strmiids uuid ole32 oleaut32 gdi32 advapi32
 DELAYIMPORTS = msvfw32
 PARENTSRC = ../strmbase
 
+EXTRADLLFLAGS = -mno-cygwin
+
 C_SRCS = \
 	audiorecord.c \
 	avico.c \
diff --git a/dlls/qcap/filewriter.c b/dlls/qcap/filewriter.c
index c3ba6c4d3eb..c377471ed7d 100644
--- a/dlls/qcap/filewriter.c
+++ b/dlls/qcap/filewriter.c
@@ -245,9 +245,9 @@ static HRESULT WINAPI filesinkfilter_SetFileName(IFileSinkFilter *iface,
     if (mt)
         FIXME("Ignoring media type %p.\n", mt);
 
-    if (!(new_filename = heap_alloc((strlenW(filename) + 1) * sizeof(WCHAR))))
+    if (!(new_filename = heap_alloc((wcslen(filename) + 1) * sizeof(WCHAR))))
         return E_OUTOFMEMORY;
-    strcpyW(new_filename, filename);
+    wcscpy(new_filename, filename);
 
     heap_free(filter->filename);
     filter->filename = new_filename;
diff --git a/dlls/qcap/qcap_private.h b/dlls/qcap/qcap_private.h
index 7c27c689677..4100c8c33d7 100644
--- a/dlls/qcap/qcap_private.h
+++ b/dlls/qcap/qcap_private.h
@@ -28,7 +28,6 @@
 #include "wine/debug.h"
 #include "wine/heap.h"
 #include "wine/strmbase.h"
-#include "wine/unicode.h"
 
 extern HINSTANCE qcap_instance DECLSPEC_HIDDEN;
 
diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c
index fe153a5c4b5..da09b2b26d6 100644
--- a/dlls/qcap/v4l.c
+++ b/dlls/qcap/v4l.c
@@ -53,6 +53,7 @@
 
 #include "ntstatus.h"
 #define WIN32_NO_STATUS
+#include "initguid.h"
 #include "qcap_private.h"
 #include "winternl.h"
 
-- 
2.29.2




More information about the wine-devel mailing list