Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Alexey Alyaev
wine
Commits
edeff310
Commit
edeff310
authored
14 years ago
by
Nikolay Sivov
Committed by
Alexandre Julliard
14 years ago
Browse files
Options
Downloads
Patches
Plain Diff
msxml3: Null pointer for schema uri should be treated as empty.
parent
21332ccb
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
dlls/msxml3/schema.c
+10
-8
10 additions, 8 deletions
dlls/msxml3/schema.c
dlls/msxml3/tests/schema.c
+36
-0
36 additions, 0 deletions
dlls/msxml3/tests/schema.c
with
46 additions
and
8 deletions
dlls/msxml3/schema.c
+
10
−
8
View file @
edeff310
...
...
@@ -63,11 +63,13 @@ static const xmlChar XDR_schema[] = "Schema";
static
const
xmlChar
XDR_nsURI
[]
=
"urn:schemas-microsoft-com:xml-data"
;
static
const
xmlChar
DT_nsURI
[]
=
"urn:schemas-microsoft-com:datatypes"
;
static
xmlChar
const
*
datatypes_src
=
NULL
;
static
int
datatypes_len
=
0
;
static
HGLOBAL
datatypes_handle
=
NULL
;
static
HRSRC
datatypes_rsrc
=
NULL
;
static
xmlSchemaPtr
datatypes_schema
=
NULL
;
static
xmlChar
const
*
datatypes_src
;
static
int
datatypes_len
;
static
HGLOBAL
datatypes_handle
;
static
HRSRC
datatypes_rsrc
;
static
xmlSchemaPtr
datatypes_schema
;
static
const
WCHAR
emptyW
[]
=
{
0
};
/* Supported Types:
* msxml3 - XDR only
...
...
@@ -1057,7 +1059,7 @@ static HRESULT WINAPI schema_cache_Invoke(IXMLDOMSchemaCollection2* iface,
static
HRESULT
WINAPI
schema_cache_add
(
IXMLDOMSchemaCollection2
*
iface
,
BSTR
uri
,
VARIANT
var
)
{
schema_cache
*
This
=
impl_from_IXMLDOMSchemaCollection2
(
iface
);
xmlChar
*
name
=
xmlChar_from_wchar
(
uri
);
xmlChar
*
name
=
uri
?
xmlChar_from_wchar
(
uri
)
:
xmlChar_from_wchar
(
emptyW
)
;
TRACE
(
"(%p)->(%s, var(vt %x))
\n
"
,
This
,
debugstr_w
(
uri
),
V_VT
(
&
var
));
switch
(
V_VT
(
&
var
))
...
...
@@ -1158,7 +1160,7 @@ static HRESULT WINAPI schema_cache_get(IXMLDOMSchemaCollection2* iface, BSTR uri
if
(
!
node
)
return
E_POINTER
;
name
=
xmlChar_from_wchar
(
uri
);
name
=
uri
?
xmlChar_from_wchar
(
uri
)
:
xmlChar_from_wchar
(
emptyW
)
;
entry
=
(
cache_entry
*
)
xmlHashLookup
(
This
->
cache
,
name
);
heap_free
(
name
);
...
...
@@ -1173,7 +1175,7 @@ static HRESULT WINAPI schema_cache_get(IXMLDOMSchemaCollection2* iface, BSTR uri
static
HRESULT
WINAPI
schema_cache_remove
(
IXMLDOMSchemaCollection2
*
iface
,
BSTR
uri
)
{
schema_cache
*
This
=
impl_from_IXMLDOMSchemaCollection2
(
iface
);
xmlChar
*
name
=
xmlChar_from_wchar
(
uri
);
xmlChar
*
name
=
uri
?
xmlChar_from_wchar
(
uri
)
:
xmlChar_from_wchar
(
emptyW
)
;
TRACE
(
"(%p)->(%s)
\n
"
,
This
,
wine_dbgstr_w
(
uri
));
xmlHashRemoveEntry
(
This
->
cache
,
name
,
cache_free
);
...
...
This diff is collapsed.
Click to expand it.
dlls/msxml3/tests/schema.c
+
36
−
0
View file @
edeff310
...
...
@@ -493,11 +493,14 @@ static void* _create_object(const GUID *clsid, const char *name, const IID *iid,
static
void
test_schema_refs
(
void
)
{
static
const
WCHAR
emptyW
[]
=
{
0
};
IXMLDOMDocument2
*
doc
;
IXMLDOMNode
*
node
;
IXMLDOMSchemaCollection
*
cache
;
VARIANT
v
;
VARIANT_BOOL
b
;
BSTR
str
;
LONG
len
;
doc
=
create_document
(
&
IID_IXMLDOMDocument2
);
if
(
!
doc
)
...
...
@@ -516,6 +519,39 @@ static void test_schema_refs(void)
ok
(
b
==
VARIANT_TRUE
,
"b %04x
\n
"
,
b
);
SysFreeString
(
str
);
node
=
(
void
*
)
0xdeadbeef
;
ole_check
(
IXMLDOMSchemaCollection_get
(
cache
,
NULL
,
&
node
));
ok
(
node
==
NULL
,
"%p
\n
"
,
node
);
/* NULL uri pointer, still adds a document */
ole_check
(
IXMLDOMSchemaCollection_add
(
cache
,
NULL
,
_variantdoc_
(
doc
)));
len
=
-
1
;
ole_check
(
IXMLDOMSchemaCollection_get_length
(
cache
,
&
len
));
ok
(
len
==
1
,
"got %d
\n
"
,
len
);
/* read back - empty valid BSTR */
str
=
NULL
;
ole_check
(
IXMLDOMSchemaCollection_get_namespaceURI
(
cache
,
0
,
&
str
));
ok
(
str
&&
*
str
==
0
,
"got %p
\n
"
,
str
);
SysFreeString
(
str
);
node
=
NULL
;
ole_check
(
IXMLDOMSchemaCollection_get
(
cache
,
NULL
,
&
node
));
ok
(
node
!=
NULL
,
"%p
\n
"
,
node
);
IXMLDOMNode_Release
(
node
);
node
=
NULL
;
str
=
SysAllocString
(
emptyW
);
ole_check
(
IXMLDOMSchemaCollection_get
(
cache
,
str
,
&
node
));
ok
(
node
!=
NULL
,
"%p
\n
"
,
node
);
IXMLDOMNode_Release
(
node
);
SysFreeString
(
str
);
/* remove with NULL uri */
ole_check
(
IXMLDOMSchemaCollection_remove
(
cache
,
NULL
));
len
=
-
1
;
ole_check
(
IXMLDOMSchemaCollection_get_length
(
cache
,
&
len
));
ok
(
len
==
0
,
"got %d
\n
"
,
len
);
str
=
SysAllocString
(
xdr_schema_uri
);
ole_check
(
IXMLDOMSchemaCollection_add
(
cache
,
str
,
_variantdoc_
(
doc
)));
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment