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
41eba1c3
Commit
41eba1c3
authored
Oct 24, 2011
by
Piotr Caban
Committed by
Alexandre Julliard
Oct 24, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
msxml3: Return parser result in detach_url.
parent
f8112cc5
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
16 additions
and
8 deletions
+16
-8
bsc.c
dlls/msxml3/bsc.c
+9
-2
domdoc.c
dlls/msxml3/domdoc.c
+5
-2
msxml_private.h
dlls/msxml3/msxml_private.h
+1
-1
saxreader.c
dlls/msxml3/saxreader.c
+1
-3
No files found.
dlls/msxml3/bsc.c
View file @
41eba1c3
...
...
@@ -53,6 +53,7 @@ struct bsc_t {
IBinding
*
binding
;
IStream
*
memstream
;
HRESULT
hres
;
};
static
inline
bsc_t
*
impl_from_IBindStatusCallback
(
IBindStatusCallback
*
iface
)
...
...
@@ -173,7 +174,7 @@ static HRESULT WINAPI bsc_OnStopBinding(
DWORD
len
=
GlobalSize
(
hglobal
);
char
*
ptr
=
GlobalLock
(
hglobal
);
hr
=
This
->
onDataAvailable
(
This
->
obj
,
ptr
,
len
);
This
->
hres
=
hr
=
This
->
onDataAvailable
(
This
->
obj
,
ptr
,
len
);
GlobalUnlock
(
hglobal
);
}
...
...
@@ -281,6 +282,7 @@ HRESULT bind_url(LPCWSTR url, HRESULT (*onDataAvailable)(void*,char*,DWORD), voi
bsc
->
onDataAvailable
=
onDataAvailable
;
bsc
->
binding
=
NULL
;
bsc
->
memstream
=
NULL
;
bsc
->
hres
=
S_OK
;
hr
=
RegisterBindStatusCallback
(
pbc
,
&
bsc
->
IBindStatusCallback_iface
,
NULL
,
0
);
if
(
SUCCEEDED
(
hr
))
...
...
@@ -309,11 +311,16 @@ HRESULT bind_url(LPCWSTR url, HRESULT (*onDataAvailable)(void*,char*,DWORD), voi
return
hr
;
}
void
detach_bsc
(
bsc_t
*
bsc
)
HRESULT
detach_bsc
(
bsc_t
*
bsc
)
{
HRESULT
hres
;
if
(
bsc
->
binding
)
IBinding_Abort
(
bsc
->
binding
);
bsc
->
obj
=
NULL
;
hres
=
bsc
->
hres
;
IBindStatusCallback_Release
(
&
bsc
->
IBindStatusCallback_iface
);
return
hres
;
}
dlls/msxml3/domdoc.c
View file @
41eba1c3
...
...
@@ -2075,8 +2075,11 @@ static HRESULT doread( domdoc *This, LPWSTR filename )
if
(
FAILED
(
hr
))
return
hr
;
if
(
This
->
bsc
)
detach_bsc
(
This
->
bsc
);
if
(
This
->
bsc
)
{
hr
=
detach_bsc
(
This
->
bsc
);
if
(
FAILED
(
hr
))
return
hr
;
}
This
->
bsc
=
bsc
;
return
S_OK
;
...
...
dlls/msxml3/msxml_private.h
View file @
41eba1c3
...
...
@@ -467,7 +467,7 @@ static inline const CLSID* SchemaCache_version(MSXML_VERSION v)
typedef
struct
bsc_t
bsc_t
;
HRESULT
bind_url
(
LPCWSTR
,
HRESULT
(
*
onDataAvailable
)(
void
*
,
char
*
,
DWORD
),
void
*
,
bsc_t
**
)
DECLSPEC_HIDDEN
;
void
detach_bsc
(
bsc_t
*
)
DECLSPEC_HIDDEN
;
HRESULT
detach_bsc
(
bsc_t
*
)
DECLSPEC_HIDDEN
;
const
char
*
debugstr_variant
(
const
VARIANT
*
)
DECLSPEC_HIDDEN
;
...
...
dlls/msxml3/saxreader.c
View file @
41eba1c3
...
...
@@ -2298,9 +2298,7 @@ static HRESULT internal_parseURL(
if
(
FAILED
(
hr
))
return
hr
;
detach_bsc
(
bsc
);
return
S_OK
;
return
detach_bsc
(
bsc
);
}
static
HRESULT
internal_putProperty
(
...
...
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