Alexandre Julliard : wbemdisp: Build with msvcrt.
Alexandre Julliard
julliard at winehq.org
Wed Jun 26 16:15:40 CDT 2019
Module: wine
Branch: master
Commit: a6df3da3f5ad287eabcf67a966c170faa9f7d80c
URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6df3da3f5ad287eabcf67a966c170faa9f7d80c
Author: Alexandre Julliard <julliard at winehq.org>
Date: Wed Jun 26 09:36:09 2019 +0200
wbemdisp: Build with msvcrt.
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/wbemdisp/Makefile.in | 2 ++
dlls/wbemdisp/locator.c | 20 +++++++++-----------
dlls/wbemdisp/main.c | 6 ++----
3 files changed, 13 insertions(+), 15 deletions(-)
diff --git a/dlls/wbemdisp/Makefile.in b/dlls/wbemdisp/Makefile.in
index 3b4ee4f..38ef9cc 100644
--- a/dlls/wbemdisp/Makefile.in
+++ b/dlls/wbemdisp/Makefile.in
@@ -1,6 +1,8 @@
MODULE = wbemdisp.dll
IMPORTS = oleaut32 ole32
+EXTRADLLFLAGS = -mno-cygwin
+
C_SRCS = \
locator.c \
main.c
diff --git a/dlls/wbemdisp/locator.c b/dlls/wbemdisp/locator.c
index c307e34..5e22989 100644
--- a/dlls/wbemdisp/locator.c
+++ b/dlls/wbemdisp/locator.c
@@ -18,7 +18,6 @@
#define COBJMACROS
-#include "config.h"
#include <stdarg.h>
#include "windef.h"
@@ -31,7 +30,6 @@
#include "wine/debug.h"
#include "wine/heap.h"
-#include "wine/unicode.h"
#include "wbemdisp_private.h"
#include "wbemdisp_classes.h"
@@ -683,7 +681,7 @@ static DISPID get_member_dispid( struct object *object, const WCHAR *name )
UINT i;
for (i = 0; i < object->nb_members; i++)
{
- if (!strcmpiW( object->members[i].name, name ))
+ if (!wcsicmp( object->members[i].name, name ))
{
if (!object->members[i].dispid)
{
@@ -1704,12 +1702,12 @@ static HRESULT WINAPI services_DeleteAsync(
static BSTR build_query_string( const WCHAR *class )
{
static const WCHAR selectW[] = {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ',0};
- UINT len = strlenW(class) + ARRAY_SIZE(selectW);
+ UINT len = lstrlenW(class) + ARRAY_SIZE(selectW);
BSTR ret;
if (!(ret = SysAllocStringLen( NULL, len ))) return NULL;
- strcpyW( ret, selectW );
- strcatW( ret, class );
+ lstrcpyW( ret, selectW );
+ lstrcatW( ret, class );
return ret;
}
@@ -2134,22 +2132,22 @@ static BSTR build_resource_string( BSTR server, BSTR namespace )
ULONG len, len_server = 0, len_namespace = 0;
BSTR ret;
- if (server && *server) len_server = strlenW( server );
+ if (server && *server) len_server = lstrlenW( server );
else len_server = 1;
- if (namespace && *namespace) len_namespace = strlenW( namespace );
+ if (namespace && *namespace) len_namespace = lstrlenW( namespace );
else len_namespace = ARRAY_SIZE(defaultW) - 1;
if (!(ret = SysAllocStringLen( NULL, 2 + len_server + 1 + len_namespace ))) return NULL;
ret[0] = ret[1] = '\\';
- if (server && *server) strcpyW( ret + 2, server );
+ if (server && *server) lstrcpyW( ret + 2, server );
else ret[2] = '.';
len = len_server + 2;
ret[len++] = '\\';
- if (namespace && *namespace) strcpyW( ret + len, namespace );
- else strcpyW( ret + len, defaultW );
+ if (namespace && *namespace) lstrcpyW( ret + len, namespace );
+ else lstrcpyW( ret + len, defaultW );
return ret;
}
diff --git a/dlls/wbemdisp/main.c b/dlls/wbemdisp/main.c
index aff4d50..b921e49 100644
--- a/dlls/wbemdisp/main.c
+++ b/dlls/wbemdisp/main.c
@@ -16,7 +16,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "config.h"
#include <stdarg.h>
#define COBJMACROS
@@ -30,7 +29,6 @@
#include "wine/debug.h"
#include "wine/heap.h"
-#include "wine/unicode.h"
#include "wbemdisp_private.h"
#include "wbemdisp_classes.h"
@@ -384,7 +382,7 @@ static HRESULT WINAPI WinMGMTS_ParseDisplayName(IParseDisplayName *iface, IBindC
TRACE( "%p, %p, %s, %p, %p\n", iface, pbc, debugstr_w(pszDisplayName), pchEaten, ppmkOut );
- if (strncmpiW( pszDisplayName, prefixW, prefix_len )) return MK_E_SYNTAX;
+ if (wcsnicmp( pszDisplayName, prefixW, prefix_len )) return MK_E_SYNTAX;
p = pszDisplayName + prefix_len;
if (*p == '{')
@@ -418,7 +416,7 @@ done:
SysFreeString( server );
SysFreeString( namespace );
SysFreeString( relative );
- if (hr == S_OK) *pchEaten = strlenW( pszDisplayName );
+ if (hr == S_OK) *pchEaten = lstrlenW( pszDisplayName );
return hr;
}
More information about the wine-cvs
mailing list