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
a6df3da3
Commit
a6df3da3
authored
Jun 26, 2019
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wbemdisp: Build with msvcrt.
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
b7b22330
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
15 deletions
+13
-15
Makefile.in
dlls/wbemdisp/Makefile.in
+2
-0
locator.c
dlls/wbemdisp/locator.c
+9
-11
main.c
dlls/wbemdisp/main.c
+2
-4
No files found.
dlls/wbemdisp/Makefile.in
View file @
a6df3da3
MODULE
=
wbemdisp.dll
IMPORTS
=
oleaut32 ole32
EXTRADLLFLAGS
=
-mno-cygwin
C_SRCS
=
\
locator.c
\
main.c
...
...
dlls/wbemdisp/locator.c
View file @
a6df3da3
...
...
@@ -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
=
l
strlenW
(
class
)
+
ARRAY_SIZE
(
selectW
);
BSTR
ret
;
if
(
!
(
ret
=
SysAllocStringLen
(
NULL
,
len
)))
return
NULL
;
strcpyW
(
ret
,
selectW
);
strcatW
(
ret
,
class
);
l
strcpyW
(
ret
,
selectW
);
l
strcatW
(
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
=
l
strlenW
(
server
);
else
len_server
=
1
;
if
(
namespace
&&
*
namespace
)
len_namespace
=
strlenW
(
namespace
);
if
(
namespace
&&
*
namespace
)
len_namespace
=
l
strlenW
(
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
)
l
strcpyW
(
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
)
l
strcpyW
(
ret
+
len
,
namespace
);
else
l
strcpyW
(
ret
+
len
,
defaultW
);
return
ret
;
}
...
...
dlls/wbemdisp/main.c
View file @
a6df3da3
...
...
@@ -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
=
l
strlenW
(
pszDisplayName
);
return
hr
;
}
...
...
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