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
6ab3f1ae
Commit
6ab3f1ae
authored
Jun 22, 2012
by
Nikolay Sivov
Committed by
Alexandre Julliard
Jun 25, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
msxml3: Return stream reference from get_output() if stream is set.
parent
729afb18
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
3 deletions
+21
-3
mxwriter.c
dlls/msxml3/mxwriter.c
+8
-3
saxreader.c
dlls/msxml3/tests/saxreader.c
+13
-0
No files found.
dlls/msxml3/mxwriter.c
View file @
6ab3f1ae
...
@@ -755,6 +755,8 @@ static HRESULT WINAPI mxwriter_get_output(IMXWriter *iface, VARIANT *dest)
...
@@ -755,6 +755,8 @@ static HRESULT WINAPI mxwriter_get_output(IMXWriter *iface, VARIANT *dest)
TRACE
(
"(%p)->(%p)
\n
"
,
This
,
dest
);
TRACE
(
"(%p)->(%p)
\n
"
,
This
,
dest
);
if
(
!
dest
)
return
E_POINTER
;
if
(
!
This
->
dest
)
if
(
!
This
->
dest
)
{
{
HRESULT
hr
=
flush_output_buffer
(
This
);
HRESULT
hr
=
flush_output_buffer
(
This
);
...
@@ -766,10 +768,13 @@ static HRESULT WINAPI mxwriter_get_output(IMXWriter *iface, VARIANT *dest)
...
@@ -766,10 +768,13 @@ static HRESULT WINAPI mxwriter_get_output(IMXWriter *iface, VARIANT *dest)
return
S_OK
;
return
S_OK
;
}
}
else
FIXME
(
"not implemented when stream is set up
\n
"
);
return
E_NOTIMPL
;
/* we only support IStream output so far */
V_VT
(
dest
)
=
VT_UNKNOWN
;
V_UNKNOWN
(
dest
)
=
(
IUnknown
*
)
This
->
dest
;
IStream_AddRef
(
This
->
dest
);
return
S_OK
;
}
}
static
HRESULT
WINAPI
mxwriter_put_encoding
(
IMXWriter
*
iface
,
BSTR
encoding
)
static
HRESULT
WINAPI
mxwriter_put_encoding
(
IMXWriter
*
iface
,
BSTR
encoding
)
...
...
dlls/msxml3/tests/saxreader.c
View file @
6ab3f1ae
...
@@ -2821,6 +2821,7 @@ static void test_mxwriter_flush(void)
...
@@ -2821,6 +2821,7 @@ static void test_mxwriter_flush(void)
VARIANT
dest
;
VARIANT
dest
;
HRESULT
hr
;
HRESULT
hr
;
char
*
buff
;
char
*
buff
;
LONG
ref
;
hr
=
CoCreateInstance
(
&
CLSID_MXXMLWriter
,
NULL
,
CLSCTX_INPROC_SERVER
,
hr
=
CoCreateInstance
(
&
CLSID_MXXMLWriter
,
NULL
,
CLSCTX_INPROC_SERVER
,
&
IID_IMXWriter
,
(
void
**
)
&
writer
);
&
IID_IMXWriter
,
(
void
**
)
&
writer
);
...
@@ -2930,6 +2931,18 @@ static void test_mxwriter_flush(void)
...
@@ -2930,6 +2931,18 @@ static void test_mxwriter_flush(void)
todo_wine
todo_wine
ok
(
pos2
.
QuadPart
!=
0
,
"unexpected stream beginning
\n
"
);
ok
(
pos2
.
QuadPart
!=
0
,
"unexpected stream beginning
\n
"
);
hr
=
IMXWriter_get_output
(
writer
,
NULL
);
EXPECT_HR
(
hr
,
E_POINTER
);
ref
=
get_refcount
(
stream
);
V_VT
(
&
dest
)
=
VT_EMPTY
;
hr
=
IMXWriter_get_output
(
writer
,
&
dest
);
EXPECT_HR
(
hr
,
S_OK
);
ok
(
V_VT
(
&
dest
)
==
VT_UNKNOWN
,
"got vt type %d
\n
"
,
V_VT
(
&
dest
));
ok
(
V_UNKNOWN
(
&
dest
)
==
(
IUnknown
*
)
stream
,
"got pointer %p
\n
"
,
V_UNKNOWN
(
&
dest
));
ok
(
ref
+
1
==
get_refcount
(
stream
),
"expected increased refcount
\n
"
);
VariantClear
(
&
dest
);
hr
=
ISAXContentHandler_endDocument
(
content
);
hr
=
ISAXContentHandler_endDocument
(
content
);
EXPECT_HR
(
hr
,
S_OK
);
EXPECT_HR
(
hr
,
S_OK
);
...
...
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