Alexandre Julliard : qmgr: Build with msvcrt.
Alexandre Julliard
julliard at winehq.org
Wed Jun 19 15:08:15 CDT 2019
Module: wine
Branch: master
Commit: d6d38f157a459765344b7e1cf13a77960cef73ec
URL: https://source.winehq.org/git/wine.git/?a=commit;h=d6d38f157a459765344b7e1cf13a77960cef73ec
Author: Alexandre Julliard <julliard at winehq.org>
Date: Wed Jun 19 10:28:11 2019 +0200
qmgr: Build with msvcrt.
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/qmgr/Makefile.in | 2 ++
dlls/qmgr/file.c | 2 +-
dlls/qmgr/job.c | 4 ++--
dlls/qmgr/qmgr.h | 13 ++++++-------
4 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/dlls/qmgr/Makefile.in b/dlls/qmgr/Makefile.in
index 7c23e84..fe051ad 100644
--- a/dlls/qmgr/Makefile.in
+++ b/dlls/qmgr/Makefile.in
@@ -1,6 +1,8 @@
MODULE = qmgr.dll
IMPORTS = uuid winhttp ole32 advapi32
+EXTRADLLFLAGS = -mno-cygwin
+
C_SRCS = \
enum_files.c \
enum_jobs.c \
diff --git a/dlls/qmgr/file.c b/dlls/qmgr/file.c
index e717dc8..6621b23 100644
--- a/dlls/qmgr/file.c
+++ b/dlls/qmgr/file.c
@@ -459,7 +459,7 @@ static BOOL transfer_file_local(BackgroundCopyFileImpl *file, const WCHAR *tmpna
transitionJobState(job, BG_JOB_STATE_QUEUED, BG_JOB_STATE_TRANSFERRING);
- if (strlenW(file->info.RemoteName) > 7 && !strncmpiW(file->info.RemoteName, fileW, 7))
+ if (lstrlenW(file->info.RemoteName) > 7 && !wcsnicmp(file->info.RemoteName, fileW, 7))
ptr = file->info.RemoteName + 7;
else
ptr = file->info.RemoteName;
diff --git a/dlls/qmgr/job.c b/dlls/qmgr/job.c
index a12e511..0eef336 100644
--- a/dlls/qmgr/job.c
+++ b/dlls/qmgr/job.c
@@ -599,7 +599,7 @@ static HRESULT WINAPI BackgroundCopyJob_SetDescription(
if (!Val) return E_INVALIDARG;
- len = strlenW(Val);
+ len = lstrlenW(Val);
if (len > max_description_len) return BG_E_STRING_TOO_LONG;
EnterCriticalSection(&This->cs);
@@ -612,7 +612,7 @@ static HRESULT WINAPI BackgroundCopyJob_SetDescription(
{
HeapFree(GetProcessHeap(), 0, This->description);
if ((This->description = HeapAlloc(GetProcessHeap(), 0, (len+1)*sizeof(WCHAR))))
- strcpyW(This->description, Val);
+ lstrcpyW(This->description, Val);
else
hr = E_OUTOFMEMORY;
}
diff --git a/dlls/qmgr/qmgr.h b/dlls/qmgr/qmgr.h
index 2bc5b8b..87f8307 100644
--- a/dlls/qmgr/qmgr.h
+++ b/dlls/qmgr/qmgr.h
@@ -31,7 +31,6 @@
#include <string.h>
#include "wine/list.h"
-#include "wine/unicode.h"
/* Background copy job vtbl and related data */
typedef struct
@@ -118,15 +117,15 @@ BOOL transitionJobState(BackgroundCopyJobImpl *job, BG_JOB_STATE from, BG_JOB_ST
/* Little helper functions */
static inline WCHAR *strdupW(const WCHAR *src)
{
- WCHAR *dst = HeapAlloc(GetProcessHeap(), 0, (strlenW(src) + 1) * sizeof(WCHAR));
- if (dst) strcpyW(dst, src);
+ WCHAR *dst = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(src) + 1) * sizeof(WCHAR));
+ if (dst) lstrcpyW(dst, src);
return dst;
}
static inline WCHAR *co_strdupW(const WCHAR *src)
{
- WCHAR *dst = CoTaskMemAlloc((strlenW(src) + 1) * sizeof(WCHAR));
- if (dst) strcpyW(dst, src);
+ WCHAR *dst = CoTaskMemAlloc((lstrlenW(src) + 1) * sizeof(WCHAR));
+ if (dst) lstrcpyW(dst, src);
return dst;
}
@@ -136,10 +135,10 @@ static inline HRESULT return_strval(const WCHAR *str, WCHAR **ret)
if (!ret) return E_INVALIDARG;
- len = strlenW(str);
+ len = lstrlenW(str);
*ret = CoTaskMemAlloc((len+1)*sizeof(WCHAR));
if (!*ret) return E_OUTOFMEMORY;
- strcpyW(*ret, str);
+ lstrcpyW(*ret, str);
return S_OK;
}
More information about the wine-cvs
mailing list