Alexandre Julliard : ieframe: Build with msvcrt.
Alexandre Julliard
julliard at winehq.org
Wed Jun 5 16:12:38 CDT 2019
Module: wine
Branch: master
Commit: 0cc13be47c8625f2137c3bfa6b9cb5b6336e2a36
URL: https://source.winehq.org/git/wine.git/?a=commit;h=0cc13be47c8625f2137c3bfa6b9cb5b6336e2a36
Author: Alexandre Julliard <julliard at winehq.org>
Date: Wed Jun 5 08:39:04 2019 +0200
ieframe: Build with msvcrt.
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/ieframe/Makefile.in | 2 ++
dlls/ieframe/dochost.c | 2 +-
dlls/ieframe/ieframe.h | 5 ++---
dlls/ieframe/iexplore.c | 14 +++++++-------
dlls/ieframe/intshcut.c | 12 ++++++------
dlls/ieframe/navigate.c | 4 ++--
6 files changed, 20 insertions(+), 19 deletions(-)
diff --git a/dlls/ieframe/Makefile.in b/dlls/ieframe/Makefile.in
index 4b1005d..6103714 100644
--- a/dlls/ieframe/Makefile.in
+++ b/dlls/ieframe/Makefile.in
@@ -2,6 +2,8 @@ MODULE = ieframe.dll
IMPORTLIB = ieframe
IMPORTS = uuid urlmon shell32 comctl32 shlwapi oleaut32 ole32 user32 gdi32 advapi32
+EXTRADLLFLAGS = -mno-cygwin
+
C_SRCS = \
classinfo.c \
client.c \
diff --git a/dlls/ieframe/dochost.c b/dlls/ieframe/dochost.c
index 389c0af..46d5cc5 100644
--- a/dlls/ieframe/dochost.c
+++ b/dlls/ieframe/dochost.c
@@ -427,7 +427,7 @@ static void update_travellog(DocHost *This)
static const WCHAR about_schemeW[] = {'a','b','o','u','t',':'};
- if(This->url && !strncmpiW(This->url, about_schemeW, ARRAY_SIZE(about_schemeW))) {
+ if(This->url && !wcsnicmp(This->url, about_schemeW, ARRAY_SIZE(about_schemeW))) {
TRACE("Skipping about URL\n");
return;
}
diff --git a/dlls/ieframe/ieframe.h b/dlls/ieframe/ieframe.h
index 8adf47e..2b4861d 100644
--- a/dlls/ieframe/ieframe.h
+++ b/dlls/ieframe/ieframe.h
@@ -37,7 +37,6 @@
#include "shdeprecated.h"
#include "docobjectservice.h"
-#include "wine/unicode.h"
#include "wine/heap.h"
#include "wine/list.h"
@@ -342,7 +341,7 @@ static inline LPWSTR heap_strdupW(LPCWSTR str)
if(str) {
DWORD size;
- size = (strlenW(str)+1)*sizeof(WCHAR);
+ size = (lstrlenW(str)+1)*sizeof(WCHAR);
ret = heap_alloc(size);
if(ret)
memcpy(ret, str, size);
@@ -353,7 +352,7 @@ static inline LPWSTR heap_strdupW(LPCWSTR str)
static inline LPWSTR co_strdupW(LPCWSTR str)
{
- WCHAR *ret = CoTaskMemAlloc((strlenW(str) + 1)*sizeof(WCHAR));
+ WCHAR *ret = CoTaskMemAlloc((lstrlenW(str) + 1)*sizeof(WCHAR));
if (ret)
lstrcpyW(ret, str);
return ret;
diff --git a/dlls/ieframe/iexplore.c b/dlls/ieframe/iexplore.c
index 4f3df13..00883c8 100644
--- a/dlls/ieframe/iexplore.c
+++ b/dlls/ieframe/iexplore.c
@@ -957,7 +957,7 @@ static BOOL create_ie_window(BOOL nohome, const WCHAR *cmdline)
VARIANT var_url;
int cmdlen;
- cmdlen = strlenW(cmdline);
+ cmdlen = lstrlenW(cmdline);
if(cmdlen > 2 && cmdline[0] == '"' && cmdline[cmdlen-1] == '"') {
cmdline++;
cmdlen -= 2;
@@ -988,18 +988,18 @@ static HDDEDATA open_dde_url(WCHAR *dde_url)
url = dde_url;
if(*url == '"') {
url++;
- url_end = strchrW(url, '"');
+ url_end = wcschr(url, '"');
if(!url_end) {
FIXME("missing string terminator\n");
return 0;
}
*url_end = 0;
}else {
- url_end = strchrW(url, ',');
+ url_end = wcschr(url, ',');
if(url_end)
*url_end = 0;
else
- url_end = url + strlenW(url);
+ url_end = url + lstrlenW(url);
}
LIST_FOR_EACH_ENTRY(iter, &ie_list, InternetExplorer, entry) {
@@ -1149,11 +1149,11 @@ DWORD WINAPI IEWinMain(const WCHAR *cmdline, int nShowWindow)
while (cmdline[length] && cmdline[length] != ' ' && cmdline[length] != '\t') length++;
- if (!strncmpiW(cmdline, embeddingW, length))
+ if (!wcsnicmp(cmdline, embeddingW, length))
embedding = TRUE;
- else if (!strncmpiW(cmdline, nohomeW, length))
+ else if (!wcsnicmp(cmdline, nohomeW, length))
nohome = TRUE;
- else if (!strncmpiW(cmdline, startmanagerW, length))
+ else if (!wcsnicmp(cmdline, startmanagerW, length))
manager = TRUE;
else
break;
diff --git a/dlls/ieframe/intshcut.c b/dlls/ieframe/intshcut.c
index 8bf8ae8..13a5582 100644
--- a/dlls/ieframe/intshcut.c
+++ b/dlls/ieframe/intshcut.c
@@ -94,15 +94,15 @@ static BOOL run_winemenubuilder( const WCHAR *args )
void *redir;
GetSystemDirectoryW( app, MAX_PATH - ARRAY_SIZE( menubuilder ));
- strcatW( app, menubuilder );
+ lstrcatW( app, menubuilder );
- len = (strlenW( app ) + strlenW( args ) + 1) * sizeof(WCHAR);
+ len = (lstrlenW( app ) + lstrlenW( args ) + 1) * sizeof(WCHAR);
buffer = heap_alloc( len );
if( !buffer )
return FALSE;
- strcpyW( buffer, app );
- strcatW( buffer, args );
+ lstrcpyW( buffer, app );
+ lstrcatW( buffer, args );
TRACE("starting %s\n",debugstr_w(buffer));
@@ -136,7 +136,7 @@ static BOOL StartLinkProcessor( LPCOLESTR szLink )
if( !buffer )
return FALSE;
- sprintfW( buffer, szFormat, szLink );
+ swprintf( buffer, len / sizeof(WCHAR), szFormat, szLink );
ret = run_winemenubuilder( buffer );
heap_free( buffer );
return ret;
@@ -521,7 +521,7 @@ static HRESULT WINAPI PersistFile_Load(IPersistFile *pFile, LPCOLESTR pszFileNam
int iconindex;
PROPSPEC ps;
PROPVARIANT pv;
- iconindex = strtolW(iconindexstring, NULL, 10);
+ iconindex = wcstol(iconindexstring, NULL, 10);
ps.ulKind = PRSPEC_PROPID;
ps.u.propid = PID_IS_ICONINDEX;
pv.vt = VT_I4;
diff --git a/dlls/ieframe/navigate.c b/dlls/ieframe/navigate.c
index 48187d9..9efdacc 100644
--- a/dlls/ieframe/navigate.c
+++ b/dlls/ieframe/navigate.c
@@ -111,7 +111,7 @@ static void set_status_text(BindStatusCallback *This, ULONG statuscode, LPCWSTR
fmt[0] = 0;
/* the format string must have one "%s" for the str */
LoadStringW(ieframe_instance, IDS_STATUSFMT_FIRST + statuscode, fmt, IDS_STATUSFMT_MAXLEN);
- snprintfW(buffer, ARRAY_SIZE(buffer), fmt, str);
+ swprintf(buffer, ARRAY_SIZE(buffer), fmt, str);
}
V_VT(&arg) = VT_BSTR;
@@ -466,7 +466,7 @@ static HRESULT WINAPI HttpNegotiate_BeginningTransaction(IHttpNegotiate *iface,
dwReserved, pszAdditionalHeaders);
if(This->headers) {
- int size = (strlenW(This->headers)+1)*sizeof(WCHAR);
+ int size = (lstrlenW(This->headers)+1)*sizeof(WCHAR);
*pszAdditionalHeaders = CoTaskMemAlloc(size);
memcpy(*pszAdditionalHeaders, This->headers, size);
}
More information about the wine-cvs
mailing list