Alexandre Julliard : ipconfig: Build with msvcrt.
Alexandre Julliard
julliard at winehq.org
Tue Apr 30 15:59:55 CDT 2019
Module: wine
Branch: master
Commit: adeb282c3329c1525e1d40b80c2764b872c5d1fc
URL: https://source.winehq.org/git/wine.git/?a=commit;h=adeb282c3329c1525e1d40b80c2764b872c5d1fc
Author: Alexandre Julliard <julliard at winehq.org>
Date: Mon Apr 29 10:49:31 2019 +0200
ipconfig: Build with msvcrt.
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
programs/ipconfig/Makefile.in | 3 ++-
programs/ipconfig/ipconfig.c | 12 ++++++------
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/programs/ipconfig/Makefile.in b/programs/ipconfig/Makefile.in
index 9a56319..0bb93ec 100644
--- a/programs/ipconfig/Makefile.in
+++ b/programs/ipconfig/Makefile.in
@@ -1,7 +1,8 @@
MODULE = ipconfig.exe
-APPMODE = -mconsole -municode
IMPORTS = iphlpapi ws2_32 user32
+EXTRADLLFLAGS = -mconsole -municode -mno-cygwin
+
C_SRCS = ipconfig.c
RC_SRCS = ipconfig.rc
diff --git a/programs/ipconfig/ipconfig.c b/programs/ipconfig/ipconfig.c
index 4370a28..adb3f8d 100644
--- a/programs/ipconfig/ipconfig.c
+++ b/programs/ipconfig/ipconfig.c
@@ -21,10 +21,10 @@
#define NONAMELESSUNION
+#include <stdio.h>
#include <winsock2.h>
#include <windows.h>
#include <iphlpapi.h>
-#include <wine/unicode.h>
#include "ipconfig.h"
@@ -130,7 +130,7 @@ static void print_field(int msg, const WCHAR *value)
WCHAR name_buffer[ARRAY_SIZE(field)];
LoadStringW(GetModuleHandleW(NULL), msg, name_buffer, ARRAY_SIZE(name_buffer));
- memcpy(field, name_buffer, sizeof(WCHAR) * min(strlenW(name_buffer), ARRAY_SIZE(field) - 1));
+ memcpy(field, name_buffer, sizeof(WCHAR) * min(lstrlenW(name_buffer), ARRAY_SIZE(field) - 1));
ipconfig_printfW(formatW, field, value);
}
@@ -259,10 +259,10 @@ static WCHAR *physaddr_to_string(WCHAR *buf, BYTE *addr, DWORD len)
for (i = 0; i < len - 1; i++)
{
- sprintfW(p, fmtW, addr[i]);
+ swprintf(p, 4, fmtW, addr[i]);
p += 3;
}
- sprintfW(p, fmt2W, addr[i]);
+ swprintf(p, 3, fmt2W, addr[i]);
}
return buf;
@@ -386,13 +386,13 @@ int wmain(int argc, WCHAR *argv[])
if (argc > 1)
{
- if (!strcmpW(slashHelp, argv[1]))
+ if (!lstrcmpW(slashHelp, argv[1]))
{
ipconfig_message(STRING_USAGE);
WSACleanup();
return 1;
}
- else if (!strcmpiW(slashAll, argv[1]))
+ else if (!wcsicmp(slashAll, argv[1]))
{
if (argv[2])
{
More information about the wine-cvs
mailing list