Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
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-winehq
Commits
c8598a73
Commit
c8598a73
authored
Oct 24, 2016
by
Hans Leidekker
Committed by
Alexandre Julliard
Oct 24, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wbemprox: Use the WS_ prefix to avoid conflicts with Unix headers.
Signed-off-by:
Hans Leidekker
<
hans@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
199b0bf8
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
6 deletions
+7
-6
Makefile.in
dlls/wbemprox/Makefile.in
+1
-0
builtin.c
dlls/wbemprox/builtin.c
+6
-6
No files found.
dlls/wbemprox/Makefile.in
View file @
c8598a73
EXTRADEFS
=
-DUSE_WS_PREFIX
MODULE
=
wbemprox.dll
IMPORTS
=
winspool version iphlpapi dxgi oleaut32 ole32 advapi32 user32 gdi32 ws2_32 rpcrt4
...
...
dlls/wbemprox/builtin.c
View file @
c8598a73
...
...
@@ -2058,11 +2058,11 @@ static enum fill_status fill_networkadapter( struct table *table, const struct e
int
physical
;
enum
fill_status
status
=
FILL_STATUS_UNFILTERED
;
ret
=
GetAdaptersAddresses
(
AF_UNSPEC
,
0
,
NULL
,
NULL
,
&
size
);
ret
=
GetAdaptersAddresses
(
WS_
AF_UNSPEC
,
0
,
NULL
,
NULL
,
&
size
);
if
(
ret
!=
ERROR_BUFFER_OVERFLOW
)
return
FILL_STATUS_FAILED
;
if
(
!
(
buffer
=
heap_alloc
(
size
)))
return
FILL_STATUS_FAILED
;
if
(
GetAdaptersAddresses
(
AF_UNSPEC
,
0
,
NULL
,
buffer
,
&
size
))
if
(
GetAdaptersAddresses
(
WS_
AF_UNSPEC
,
0
,
NULL
,
buffer
,
&
size
))
{
heap_free
(
buffer
);
return
FILL_STATUS_FAILED
;
...
...
@@ -2111,11 +2111,11 @@ static enum fill_status fill_networkadapter( struct table *table, const struct e
static
WCHAR
*
get_dnshostname
(
IP_ADAPTER_UNICAST_ADDRESS
*
addr
)
{
const
SOCKET_ADDRESS
*
sa
=
&
addr
->
Address
;
WCHAR
buf
[
NI_MAXHOST
];
WCHAR
buf
[
WS_
NI_MAXHOST
];
if
(
!
addr
)
return
NULL
;
if
(
GetNameInfoW
(
sa
->
lpSockaddr
,
sa
->
iSockaddrLength
,
buf
,
sizeof
(
buf
)
/
sizeof
(
buf
[
0
]),
NULL
,
0
,
NI_NAMEREQD
))
return
NULL
;
0
,
WS_
NI_NAMEREQD
))
return
NULL
;
return
heap_strdupW
(
buf
);
}
static
struct
array
*
get_defaultipgateway
(
IP_ADAPTER_GATEWAY_ADDRESS
*
list
)
...
...
@@ -2203,11 +2203,11 @@ static enum fill_status fill_networkadapterconfig( struct table *table, const st
DWORD
size
=
0
,
ret
;
enum
fill_status
status
=
FILL_STATUS_UNFILTERED
;
ret
=
GetAdaptersAddresses
(
AF_UNSPEC
,
GAA_FLAG_INCLUDE_ALL_GATEWAYS
,
NULL
,
NULL
,
&
size
);
ret
=
GetAdaptersAddresses
(
WS_
AF_UNSPEC
,
GAA_FLAG_INCLUDE_ALL_GATEWAYS
,
NULL
,
NULL
,
&
size
);
if
(
ret
!=
ERROR_BUFFER_OVERFLOW
)
return
FILL_STATUS_FAILED
;
if
(
!
(
buffer
=
heap_alloc
(
size
)))
return
FILL_STATUS_FAILED
;
if
(
GetAdaptersAddresses
(
AF_UNSPEC
,
GAA_FLAG_INCLUDE_ALL_GATEWAYS
,
NULL
,
buffer
,
&
size
))
if
(
GetAdaptersAddresses
(
WS_
AF_UNSPEC
,
GAA_FLAG_INCLUDE_ALL_GATEWAYS
,
NULL
,
buffer
,
&
size
))
{
heap_free
(
buffer
);
return
FILL_STATUS_FAILED
;
...
...
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