[PATCH v2 1/2] winegstreamer: Use ULONGLONG instead of uint64_t in Unix library interface structures.

[Zebediah Figura]

The latter has inconsistent alignment between the Unix and Win32 sides.

Signed-off-by: Zebediah Figura 
---
 dlls/winegstreamer/gst_private.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h
index 03d19af1031..b8629fc8aa1 100644
--- a/dlls/winegstreamer/gst_private.h
+++ b/dlls/winegstreamer/gst_private.h
@@ -150,17 +150,18 @@ struct wg_parser_event
         struct
         {
             /* pts and duration are in 100-nanosecond units. */
-            uint64_t pts, duration;
+            ULONGLONG pts, duration;
             uint32_t size;
             bool discontinuity, preroll, delta, has_pts, has_duration;
         } buffer;
         struct
         {
-            uint64_t position, stop;
+            ULONGLONG position, stop;
             double rate;
         } segment;
     } u;
 };
+C_ASSERT(sizeof(struct wg_parser_event) == 40);

struct unix_funcs
 {

[PATCH v2 2/2] winegstreamer: Build with msvcrt.

[Zebediah Figura]

Signed-off-by: Zebediah Figura 
---
 dlls/winegstreamer/Makefile.in    | 2 ++
 dlls/winegstreamer/audioconvert.c | 3 ---
 dlls/winegstreamer/gst_private.h  | 3 ---
 dlls/winegstreamer/gstdemux.c     | 7 +++----
 dlls/winegstreamer/main.c         | 2 +-
 dlls/winegstreamer/media_source.c | 6 +-----
 dlls/winegstreamer/mfplat.c       | 3 ---
 dlls/winegstreamer/wg_parser.c    | 4 ++++
 8 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/dlls/winegstreamer/Makefile.in b/dlls/winegstreamer/Makefile.in
index debdae2d4bb..996818fa457 100644
--- a/dlls/winegstreamer/Makefile.in
+++ b/dlls/winegstreamer/Makefile.in
@@ -5,6 +5,8 @@ EXTRAINCL = $(GSTREAMER_CFLAGS)
 EXTRALIBS = $(GSTREAMER_LIBS) $(PTHREAD_LIBS)
 PARENTSRC = ../strmbase

+EXTRADLLFLAGS = -mno-cygwin
+
 C_SRCS = \
    audioconvert.c \
    filter.c \
diff --git a/dlls/winegstreamer/audioconvert.c b/dlls/winegstreamer/audioconvert.c
index f4e841fe3e4..3b6571ab60d 100644
--- a/dlls/winegstreamer/audioconvert.c
+++ b/dlls/winegstreamer/audioconvert.c
@@ -17,9 +17,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */

-#include "config.h"
-#include <gst/gst.h>
-
 #include "gst_private.h"

#include "mfapi.h"
diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h
index b8629fc8aa1..ef3146e2f26 100644
--- a/dlls/winegstreamer/gst_private.h
+++ b/dlls/winegstreamer/gst_private.h
@@ -25,9 +25,6 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdio.h>
-#include <gst/gst.h>
-#include <gst/video/video.h>
-#include <gst/audio/audio.h>

#define COBJMACROS
 #define NONAMELESSSTRUCT
diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c
index 910abada48c..84e6bcd61e4 100644
--- a/dlls/winegstreamer/gstdemux.c
+++ b/dlls/winegstreamer/gstdemux.c
@@ -20,17 +20,16 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */

-#include "config.h"
 #include "gst_private.h"
 #include "gst_guids.h"

#include "vfwmsgs.h"
 #include "amvideo.h"

-#include "wine/unicode.h"
 #include "wine/debug.h"

#include <assert.h>
+#include <limits.h>

#include "dvdmedia.h"
 #include "mmreg.h"
@@ -1016,7 +1015,7 @@ static BOOL decodebin_parser_filter_init_gst(struct parser *filter)
     stream_count = unix_funcs->wg_parser_get_stream_count(parser);
     for (i = 0; i < stream_count; ++i)
     {
-        sprintfW(source_name, formatW, i);
+        swprintf(source_name, ARRAY_SIZE(source_name), formatW, i);
         if (!create_pin(filter, unix_funcs->wg_parser_get_stream(parser, i), source_name))
             return FALSE;
     }
@@ -1677,7 +1676,7 @@ static BOOL avi_splitter_filter_init_gst(struct parser *filter)
     stream_count = unix_funcs->wg_parser_get_stream_count(parser);
     for (i = 0; i < stream_count; ++i)
     {
-        sprintfW(source_name, formatW, i);
+        swprintf(source_name, ARRAY_SIZE(source_name), formatW, i);
         if (!create_pin(filter, unix_funcs->wg_parser_get_stream(parser, i), source_name))
             return FALSE;
     }
diff --git a/dlls/winegstreamer/main.c b/dlls/winegstreamer/main.c
index ee9f57b6c57..6f3be9095d6 100644
--- a/dlls/winegstreamer/main.c
+++ b/dlls/winegstreamer/main.c
@@ -19,9 +19,9 @@
  */

#include "gst_private.h"
+#include "winternl.h"
 #include "rpcproxy.h"
 #include "wine/debug.h"
-#include "wine/unicode.h"

#include "initguid.h"
 #include "gst_guids.h"
diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c
index 32b4477ad88..e69370d2513 100644
--- a/dlls/winegstreamer/media_source.c
+++ b/dlls/winegstreamer/media_source.c
@@ -18,10 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */

-#include "config.h"
-
-#include <gst/gst.h>
-
 #include "gst_private.h"

#include <assert.h>
@@ -1083,7 +1079,7 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_
 {
     IMFStreamDescriptor **descriptors = NULL;
     struct media_source *object;
-    gint64 total_pres_time = 0;
+    UINT64 total_pres_time = 0;
     struct wg_parser *parser;
     DWORD bytestream_caps;
     uint64_t file_size;
diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c
index 8891facdffe..439fc2ee5ed 100644
--- a/dlls/winegstreamer/mfplat.c
+++ b/dlls/winegstreamer/mfplat.c
@@ -17,9 +17,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */

-#include "config.h"
-#include <gst/gst.h>
-
 #include "gst_private.h"

#include <assert.h>
diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c
index 257da2538af..a7b3e6348cf 100644
--- a/dlls/winegstreamer/wg_parser.c
+++ b/dlls/winegstreamer/wg_parser.c
@@ -29,7 +29,11 @@
 #define WIN32_NO_STATUS
 #include "gst_private.h"
 #include "winternl.h"
+
 #include <assert.h>
+#include <gst/gst.h>
+#include <gst/video/video.h>
+#include <gst/audio/audio.h>

WINE_DEFAULT_DEBUG_CHANNEL(gstreamer);