Alexandre Julliard : wintab32: Build with msvcrt.

[Alexandre Julliard]

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

Author: Alexandre Julliard 
Date:   Thu Jun 27 09:07:44 2019 +0200

wintab32: Build with msvcrt.

Signed-off-by: Alexandre Julliard

---

dlls/wintab32/Makefile.in | 2 ++
 dlls/wintab32/context.c   | 1 -
 dlls/wintab32/manager.c   | 2 --
 dlls/wintab32/wintab32.c  | 5 ++---
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/dlls/wintab32/Makefile.in b/dlls/wintab32/Makefile.in
index 050c78b..5e25e07 100644
--- a/dlls/wintab32/Makefile.in
+++ b/dlls/wintab32/Makefile.in
@@ -2,6 +2,8 @@ MODULE    = wintab32.dll
 IMPORTLIB = wintab32
 IMPORTS   = user32 advapi32

+EXTRADLLFLAGS = -mno-cygwin
+
 C_SRCS = \
    context.c \
    manager.c \
diff --git a/dlls/wintab32/context.c b/dlls/wintab32/context.c
index 9882a3c..0514dd7 100644
--- a/dlls/wintab32/context.c
+++ b/dlls/wintab32/context.c
@@ -19,7 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */

-#include "config.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
diff --git a/dlls/wintab32/manager.c b/dlls/wintab32/manager.c
index 200fd3c..d8d6955 100644
--- a/dlls/wintab32/manager.c
+++ b/dlls/wintab32/manager.c
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */

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

#include "windef.h"
diff --git a/dlls/wintab32/wintab32.c b/dlls/wintab32/wintab32.c
index fe535fa..98ce2bc 100644
--- a/dlls/wintab32/wintab32.c
+++ b/dlls/wintab32/wintab32.c
@@ -29,7 +29,6 @@
 #define NOFIX32
 #include "wintab.h"
 #include "wintab_internal.h"
-#include "wine/unicode.h"
 #include "wine/debug.h"

WINE_DEFAULT_DEBUG_CHANNEL(wintab32);
@@ -94,8 +93,8 @@ static HMODULE load_graphics_driver(void)

if (!guid_atom) return 0;
     memcpy( key, key_pathW, sizeof(key_pathW) );
-    if (!GlobalGetAtomNameW( guid_atom, key + strlenW(key), 40 )) return 0;
-    strcatW( key, displayW );
+    if (!GlobalGetAtomNameW( guid_atom, key + lstrlenW(key), 40 )) return 0;
+    lstrcatW( key, displayW );
     if (RegOpenKeyW( HKEY_LOCAL_MACHINE, key, &hkey )) return 0;
     size = sizeof(path);
     if (!RegQueryValueExW( hkey, driverW, NULL, NULL, (BYTE *)path, &size )) ret = LoadLibraryW( path );