Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-cw
Commits
adeb282c
Commit
adeb282c
authored
Apr 29, 2019
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ipconfig: Build with msvcrt.
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
d47770e5
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
7 deletions
+8
-7
Makefile.in
programs/ipconfig/Makefile.in
+2
-1
ipconfig.c
programs/ipconfig/ipconfig.c
+6
-6
No files found.
programs/ipconfig/Makefile.in
View file @
adeb282c
MODULE
=
ipconfig.exe
MODULE
=
ipconfig.exe
APPMODE
=
-mconsole
-municode
IMPORTS
=
iphlpapi ws2_32 user32
IMPORTS
=
iphlpapi ws2_32 user32
EXTRADLLFLAGS
=
-mconsole
-municode
-mno-cygwin
C_SRCS
=
ipconfig.c
C_SRCS
=
ipconfig.c
RC_SRCS
=
ipconfig.rc
RC_SRCS
=
ipconfig.rc
programs/ipconfig/ipconfig.c
View file @
adeb282c
...
@@ -21,10 +21,10 @@
...
@@ -21,10 +21,10 @@
#define NONAMELESSUNION
#define NONAMELESSUNION
#include <stdio.h>
#include <winsock2.h>
#include <winsock2.h>
#include <windows.h>
#include <windows.h>
#include <iphlpapi.h>
#include <iphlpapi.h>
#include <wine/unicode.h>
#include "ipconfig.h"
#include "ipconfig.h"
...
@@ -130,7 +130,7 @@ static void print_field(int msg, const WCHAR *value)
...
@@ -130,7 +130,7 @@ static void print_field(int msg, const WCHAR *value)
WCHAR
name_buffer
[
ARRAY_SIZE
(
field
)];
WCHAR
name_buffer
[
ARRAY_SIZE
(
field
)];
LoadStringW
(
GetModuleHandleW
(
NULL
),
msg
,
name_buffer
,
ARRAY_SIZE
(
name_buffer
));
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
(
l
strlenW
(
name_buffer
),
ARRAY_SIZE
(
field
)
-
1
));
ipconfig_printfW
(
formatW
,
field
,
value
);
ipconfig_printfW
(
formatW
,
field
,
value
);
}
}
...
@@ -259,10 +259,10 @@ static WCHAR *physaddr_to_string(WCHAR *buf, BYTE *addr, DWORD len)
...
@@ -259,10 +259,10 @@ static WCHAR *physaddr_to_string(WCHAR *buf, BYTE *addr, DWORD len)
for
(
i
=
0
;
i
<
len
-
1
;
i
++
)
for
(
i
=
0
;
i
<
len
-
1
;
i
++
)
{
{
s
printfW
(
p
,
fmtW
,
addr
[
i
]);
s
wprintf
(
p
,
4
,
fmtW
,
addr
[
i
]);
p
+=
3
;
p
+=
3
;
}
}
s
printfW
(
p
,
fmt2W
,
addr
[
i
]);
s
wprintf
(
p
,
3
,
fmt2W
,
addr
[
i
]);
}
}
return
buf
;
return
buf
;
...
@@ -386,13 +386,13 @@ int wmain(int argc, WCHAR *argv[])
...
@@ -386,13 +386,13 @@ int wmain(int argc, WCHAR *argv[])
if
(
argc
>
1
)
if
(
argc
>
1
)
{
{
if
(
!
strcmpW
(
slashHelp
,
argv
[
1
]))
if
(
!
l
strcmpW
(
slashHelp
,
argv
[
1
]))
{
{
ipconfig_message
(
STRING_USAGE
);
ipconfig_message
(
STRING_USAGE
);
WSACleanup
();
WSACleanup
();
return
1
;
return
1
;
}
}
else
if
(
!
strcmpiW
(
slashAll
,
argv
[
1
]))
else
if
(
!
wcsicmp
(
slashAll
,
argv
[
1
]))
{
{
if
(
argv
[
2
])
if
(
argv
[
2
])
{
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment