Alexandre Julliard : opcservices: Build with msvcrt.
Alexandre Julliard
julliard at winehq.org
Mon Nov 25 16:41:55 CST 2019
Module: wine
Branch: master
Commit: 8631960745396109ec450eafb9fe76684388f84a
URL: https://source.winehq.org/git/wine.git/?a=commit;h=8631960745396109ec450eafb9fe76684388f84a
Author: Alexandre Julliard <julliard at winehq.org>
Date: Mon Nov 25 13:30:44 2019 +0100
opcservices: Build with msvcrt.
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/opcservices/Makefile.in | 2 ++
dlls/opcservices/compress.c | 2 --
dlls/opcservices/package.c | 11 +++++------
dlls/opcservices/uri.c | 11 +++++------
4 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/dlls/opcservices/Makefile.in b/dlls/opcservices/Makefile.in
index 2b6c1ce57a..b55c79826d 100644
--- a/dlls/opcservices/Makefile.in
+++ b/dlls/opcservices/Makefile.in
@@ -1,6 +1,8 @@
MODULE = opcservices.dll
IMPORTS = uuid ole32 advapi32 urlmon xmllite oleaut32
+EXTRADLLFLAGS = -mno-cygwin
+
C_SRCS = \
compress.c \
deflate.c \
diff --git a/dlls/opcservices/compress.c b/dlls/opcservices/compress.c
index 19a4f0399f..0ee876512c 100644
--- a/dlls/opcservices/compress.c
+++ b/dlls/opcservices/compress.c
@@ -18,8 +18,6 @@
#define COBJMACROS
-#include "config.h"
-
#include <stdarg.h>
#include "windef.h"
diff --git a/dlls/opcservices/package.c b/dlls/opcservices/package.c
index 9bdd4b1f15..6ed7f6bcd7 100644
--- a/dlls/opcservices/package.c
+++ b/dlls/opcservices/package.c
@@ -26,7 +26,6 @@
#include "wine/debug.h"
#include "wine/list.h"
-#include "wine/unicode.h"
#include "opc_private.h"
@@ -732,7 +731,7 @@ static WCHAR *opc_strdupW(const WCHAR *str)
{
size_t size;
- size = (strlenW(str) + 1) * sizeof(WCHAR);
+ size = (lstrlenW(str) + 1) * sizeof(WCHAR);
ret = CoTaskMemAlloc(size);
if (ret)
memcpy(ret, str, size);
@@ -1169,7 +1168,7 @@ static struct opc_relationship *opc_relationshipset_get_rel(struct opc_relations
for (i = 0; i < relationship_set->count; i++)
{
- if (!strcmpW(id, relationship_set->relationships[i]->id))
+ if (!wcscmp(id, relationship_set->relationships[i]->id))
return relationship_set->relationships[i];
}
@@ -1207,7 +1206,7 @@ static HRESULT opc_relationship_create(struct opc_relationship_set *set, const W
/* FIXME: test that generated id is unique */
RtlGenRandom(&generated, sizeof(generated));
- sprintfW(relationship->id, fmtW, generated);
+ swprintf(relationship->id, 10, fmtW, generated);
if (opc_relationshipset_get_rel(set, relationship->id))
{
@@ -1635,11 +1634,11 @@ static HRESULT opc_package_add_content_type(struct content_types *types, IOpcPar
if (cur->element == CONTENT_TYPE_OVERRIDE)
continue;
- if (!strcmpiW(cur->u.def.ext, ext))
+ if (!wcsicmp(cur->u.def.ext, ext))
{
added = TRUE;
- if (!strcmpW(cur->u.def.type, content_type))
+ if (!wcscmp(cur->u.def.type, content_type))
break;
hr = opc_package_add_override_content_type(types, part);
diff --git a/dlls/opcservices/uri.c b/dlls/opcservices/uri.c
index 800ae34571..db889f7144 100644
--- a/dlls/opcservices/uri.c
+++ b/dlls/opcservices/uri.c
@@ -23,7 +23,6 @@
#include "winbase.h"
#include "wine/debug.h"
-#include "wine/unicode.h"
#include "opc_private.h"
@@ -467,7 +466,7 @@ static IUri *opc_part_uri_get_rels_uri(IUri *uri)
return NULL;
}
- end = strrchrW(path, '/');
+ end = wcsrchr(path, '/');
if (end && end >= path + ARRAY_SIZE(relsdirW) - 1)
start = end - ARRAY_SIZE(relsdirW) + 1;
if (!start)
@@ -476,7 +475,7 @@ static IUri *opc_part_uri_get_rels_uri(IUri *uri)
/* Test if it's already relationships uri. */
if (len > ARRAY_SIZE(relsextW))
{
- if (!strcmpW(path + len - ARRAY_SIZE(relsextW) + 1, relsextW))
+ if (!wcscmp(path + len - ARRAY_SIZE(relsextW) + 1, relsextW))
{
if (start && !memcmp(start, relsdirW, ARRAY_SIZE(relsdirW) - sizeof(WCHAR)))
{
@@ -500,9 +499,9 @@ static IUri *opc_part_uri_get_rels_uri(IUri *uri)
ret[start - path] = 0;
}
- strcatW(ret, relsdirW);
- strcatW(ret, end);
- strcatW(ret, relsextW);
+ lstrcatW(ret, relsdirW);
+ lstrcatW(ret, end);
+ lstrcatW(ret, relsextW);
if (FAILED(hr = CreateUri(ret, Uri_CREATE_ALLOW_RELATIVE, 0, &rels_uri)))
WARN("Failed to create rels uri, hr %#x.\n", hr);
More information about the wine-cvs
mailing list