Alexandre Julliard : sapi: Build with msvcrt.

[Alexandre Julliard]

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

Author: Alexandre Julliard 
Date:   Thu Jun 20 09:06:34 2019 +0200

sapi: Build with msvcrt.

Signed-off-by: Alexandre Julliard

---

dlls/sapi/Makefile.in    | 2 ++
 dlls/sapi/main.c         | 1 -
 dlls/sapi/sapi_private.h | 3 +--
 dlls/sapi/token.c        | 3 +--
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/dlls/sapi/Makefile.in b/dlls/sapi/Makefile.in
index b8b4beb..94e21bd 100644
--- a/dlls/sapi/Makefile.in
+++ b/dlls/sapi/Makefile.in
@@ -1,6 +1,8 @@
 MODULE    = sapi.dll
 IMPORTS   = uuid ole32 user32 advapi32

+EXTRADLLFLAGS = -mno-cygwin
+
 C_SRCS = \
    main.c \
    token.c
diff --git a/dlls/sapi/main.c b/dlls/sapi/main.c
index 5ad6b63..f86fee2 100644
--- a/dlls/sapi/main.c
+++ b/dlls/sapi/main.c
@@ -18,7 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */

-#include "config.h"
 #include <stdarg.h>

#define COBJMACROS
diff --git a/dlls/sapi/sapi_private.h b/dlls/sapi/sapi_private.h
index b069222..1f89672 100644
--- a/dlls/sapi/sapi_private.h
+++ b/dlls/sapi/sapi_private.h
@@ -19,7 +19,6 @@
  */

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

HRESULT data_key_create( IUnknown *outer, REFIID iid, void **obj ) DECLSPEC_HIDDEN;
 HRESULT token_category_create( IUnknown *outer, REFIID iid, void **obj ) DECLSPEC_HIDDEN;
@@ -32,7 +31,7 @@ static inline LPWSTR heap_strdupW(LPCWSTR str)

if (str)
     {
-        size = (strlenW( str ) + 1) * sizeof(WCHAR);
+        size = (lstrlenW( str ) + 1) * sizeof(WCHAR);
         ret = heap_alloc( size );
         if (ret) memcpy( ret, str, size );
     }
diff --git a/dlls/sapi/token.c b/dlls/sapi/token.c
index eb35928..d2b70c9 100644
--- a/dlls/sapi/token.c
+++ b/dlls/sapi/token.c
@@ -18,7 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */

-#include "config.h"
 #include <stdarg.h>

#define COBJMACROS
@@ -387,7 +386,7 @@ static HRESULT parse_cat_id( const WCHAR *str, HKEY *root, const WCHAR **sub_key
         { NULL }
     };
     struct table *ptr;
-    int len = strlenW( str );
+    int len = lstrlenW( str );

for (ptr = table; ptr->name; ptr++)
     {