Alexandre Julliard : mf: Build with msvcrt.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: c7d06a084b5c70e9325d85ac264639d90cafb34b
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=c7d06a084b5c70e9325d85ac264639d90cafb34b

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Tue Jun 11 08:23:31 2019 +0200

mf: Build with msvcrt.

Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/mf/Makefile.in | 2 ++
 dlls/mf/main.c      | 6 ++----
 dlls/mf/session.c   | 1 -
 dlls/mf/topology.c  | 4 +---
 4 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/dlls/mf/Makefile.in b/dlls/mf/Makefile.in
index bdf5887..d23349c 100644
--- a/dlls/mf/Makefile.in
+++ b/dlls/mf/Makefile.in
@@ -2,6 +2,8 @@ MODULE    = mf.dll
 IMPORTLIB = mf
 IMPORTS   = mfplat ole32 uuid mfuuid
 
+EXTRADLLFLAGS = -mno-cygwin
+
 C_SRCS = \
 	main.c \
 	samplegrabber.c \
diff --git a/dlls/mf/main.c b/dlls/mf/main.c
index 6db13f1..2e6dc78 100644
--- a/dlls/mf/main.c
+++ b/dlls/mf/main.c
@@ -16,7 +16,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "config.h"
 
 #include <stdarg.h>
 
@@ -39,7 +38,6 @@
 
 #include "wine/debug.h"
 #include "wine/heap.h"
-#include "wine/unicode.h"
 #include "wine/list.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(mfplat);
@@ -705,7 +703,7 @@ static WCHAR *heap_strdupW(const WCHAR *str)
     {
         unsigned int size;
 
-        size = (strlenW(str) + 1) * sizeof(WCHAR);
+        size = (lstrlenW(str) + 1) * sizeof(WCHAR);
         ret = heap_alloc(size);
         if (ret)
             memcpy(ret, str, size);
@@ -930,7 +928,7 @@ static HRESULT WINAPI file_scheme_handler_callback_Invoke(IMFAsyncCallback *ifac
 
     /* Strip from scheme, MFCreateFile() won't be expecting it. */
     url = context->url;
-    if (!strncmpiW(context->url, schemeW, ARRAY_SIZE(schemeW)))
+    if (!wcsnicmp(context->url, schemeW, ARRAY_SIZE(schemeW)))
         url += ARRAY_SIZE(schemeW);
 
     hr = MFCreateFile(context->flags & MF_RESOLUTION_WRITE ? MF_ACCESSMODE_READWRITE : MF_ACCESSMODE_READ,
diff --git a/dlls/mf/session.c b/dlls/mf/session.c
index 3fce937..c43e6d2 100644
--- a/dlls/mf/session.c
+++ b/dlls/mf/session.c
@@ -15,7 +15,6 @@
  * 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 <stdarg.h>
 
diff --git a/dlls/mf/topology.c b/dlls/mf/topology.c
index 81fd175..e48792e 100644
--- a/dlls/mf/topology.c
+++ b/dlls/mf/topology.c
@@ -16,8 +16,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "config.h"
-#include "wine/port.h"
 
 #include <stdarg.h>
 
@@ -806,7 +804,7 @@ static TOPOID topology_generate_id(void)
     {
         old = next_topology_id;
     }
-    while (interlocked_cmpxchg64((LONG64 *)&next_topology_id, old + 1, old) != old);
+    while (InterlockedCompareExchange64((LONG64 *)&next_topology_id, old + 1, old) != old);
 
     return next_topology_id;
 }