Alexandre Julliard : infosoft: Build with msvcrt.
Alexandre Julliard
julliard at winehq.org
Thu Jun 6 17:05:18 CDT 2019
Module: wine
Branch: master
Commit: 691fe545125cf9216e70d6e3afc58bd4a7a8c355
URL: https://source.winehq.org/git/wine.git/?a=commit;h=691fe545125cf9216e70d6e3afc58bd4a7a8c355
Author: Alexandre Julliard <julliard at winehq.org>
Date: Thu Jun 6 09:02:08 2019 +0200
infosoft: Build with msvcrt.
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/infosoft/Makefile.in | 2 ++
dlls/infosoft/infosoft_main.c | 1 -
dlls/infosoft/wordbreaker.c | 6 ++----
3 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/dlls/infosoft/Makefile.in b/dlls/infosoft/Makefile.in
index 359bd80..813e65d 100644
--- a/dlls/infosoft/Makefile.in
+++ b/dlls/infosoft/Makefile.in
@@ -1,6 +1,8 @@
MODULE = infosoft.dll
IMPORTS = uuid advapi32
+EXTRADLLFLAGS = -mno-cygwin
+
C_SRCS = \
infosoft_main.c \
wordbreaker.c
diff --git a/dlls/infosoft/infosoft_main.c b/dlls/infosoft/infosoft_main.c
index 9524291..1d93b49 100644
--- a/dlls/infosoft/infosoft_main.c
+++ b/dlls/infosoft/infosoft_main.c
@@ -20,7 +20,6 @@
#define COBJMACROS
-#include "config.h"
#include <stdarg.h>
#include <stdio.h>
diff --git a/dlls/infosoft/wordbreaker.c b/dlls/infosoft/wordbreaker.c
index ceb9e18..aa432eb 100644
--- a/dlls/infosoft/wordbreaker.c
+++ b/dlls/infosoft/wordbreaker.c
@@ -20,7 +20,6 @@
#define COBJMACROS
-#include "config.h"
#include <stdarg.h>
@@ -29,7 +28,6 @@
#include "winuser.h"
#include "ole2.h"
#include "indexsrv.h"
-#include "wine/unicode.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(infosoft);
@@ -128,7 +126,7 @@ static HRESULT WINAPI wb_BreakText( IWordBreaker *iface,
{
case 0: /* skip spaces and punctuation */
- if (!ch || ispunctW(ch) || isspaceW(ch))
+ if (!ch || iswpunct(ch) || iswspace(ch))
ts->iCur ++;
else
state = 1;
@@ -136,7 +134,7 @@ static HRESULT WINAPI wb_BreakText( IWordBreaker *iface,
case 1: /* find the end of the word */
- if (ch && !ispunctW(ch) && !isspaceW(ch))
+ if (ch && !iswpunct(ch) && !iswspace(ch))
len++;
else
{
More information about the wine-cvs
mailing list