Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
21043e5a
Commit
21043e5a
authored
Jul 22, 2015
by
Zhenbo Li
Committed by
Alexandre Julliard
Jul 22, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mshtml: Add IHTMLXMLHttpRequest::status property implementation.
parent
4ea5d00e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
26 additions
and
11 deletions
+26
-11
xmlhttprequest.c
dlls/mshtml/tests/xmlhttprequest.c
+9
-9
xmlhttprequest.c
dlls/mshtml/xmlhttprequest.c
+17
-2
No files found.
dlls/mshtml/tests/xmlhttprequest.c
View file @
21043e5a
...
...
@@ -449,12 +449,12 @@ static void test_sync_xhr(IHTMLDocument2 *doc, const char *xml_url)
ok
(
val
==
0
,
"Expect UNSENT, got %d
\n
"
,
val
);
hres
=
IHTMLXMLHttpRequest_get_status
(
xhr
,
NULL
);
todo_wine
ok
(
hres
==
E_POINTER
,
"Expect E_POINTER, got %08x
\n
"
,
hres
);
ok
(
hres
==
E_POINTER
,
"Expect E_POINTER, got %08x
\n
"
,
hres
);
val
=
0xdeadbeef
;
hres
=
IHTMLXMLHttpRequest_get_status
(
xhr
,
&
val
);
todo_wine
ok
(
hres
==
E_FAIL
,
"Expect E_FAIL, got: %08x
\n
"
,
hres
);
todo_wine
ok
(
val
==
0
,
"Expect 0, got %d
\n
"
,
val
);
ok
(
hres
==
E_FAIL
,
"Expect E_FAIL, got: %08x
\n
"
,
hres
);
ok
(
val
==
0
,
"Expect 0, got %d
\n
"
,
val
);
hres
=
IHTMLXMLHttpRequest_get_statusText
(
xhr
,
NULL
);
todo_wine
ok
(
hres
==
E_POINTER
,
"Expect E_POINTER, got %08x
\n
"
,
hres
);
...
...
@@ -561,8 +561,8 @@ static void test_async_xhr(IHTMLDocument2 *doc, const char *xml_url)
val
=
0xdeadbeef
;
hres
=
IHTMLXMLHttpRequest_get_status
(
xhr
,
&
val
);
todo_wine
ok
(
hres
==
E_FAIL
,
"Expect E_FAIL, got: %08x
\n
"
,
hres
);
todo_wine
ok
(
val
==
0
,
"Expect 0, got %d
\n
"
,
val
);
ok
(
hres
==
E_FAIL
,
"Expect E_FAIL, got: %08x
\n
"
,
hres
);
ok
(
val
==
0
,
"Expect 0, got %d
\n
"
,
val
);
text
=
(
BSTR
)
0xdeadbeef
;
hres
=
IHTMLXMLHttpRequest_get_statusText
(
xhr
,
&
text
);
...
...
@@ -596,8 +596,8 @@ static void test_async_xhr(IHTMLDocument2 *doc, const char *xml_url)
val
=
0xdeadbeef
;
hres
=
IHTMLXMLHttpRequest_get_status
(
xhr
,
&
val
);
todo_wine
ok
(
hres
==
E_FAIL
,
"Expect E_FAIL, got: %08x
\n
"
,
hres
);
todo_wine
ok
(
val
==
0
,
"Expect 0, got %d
\n
"
,
val
);
ok
(
hres
==
E_FAIL
,
"Expect E_FAIL, got: %08x
\n
"
,
hres
);
ok
(
val
==
0
,
"Expect 0, got %d
\n
"
,
val
);
hres
=
IHTMLXMLHttpRequest_get_statusText
(
xhr
,
&
text
);
todo_wine
ok
(
hres
==
E_FAIL
,
"Expect E_FAIL, got: %08x
\n
"
,
hres
);
...
...
@@ -630,8 +630,8 @@ static void test_async_xhr(IHTMLDocument2 *doc, const char *xml_url)
val
=
0xdeadbeef
;
hres
=
IHTMLXMLHttpRequest_get_status
(
xhr
,
&
val
);
todo_wine
ok
(
hres
==
S_OK
,
"get_status failed: %08x
\n
"
,
hres
);
todo_wine
ok
(
val
==
200
,
"Expect 200, got %d
\n
"
,
val
);
ok
(
hres
==
S_OK
,
"get_status failed: %08x
\n
"
,
hres
);
ok
(
val
==
200
,
"Expect 200, got %d
\n
"
,
val
);
text
=
NULL
;
hres
=
IHTMLXMLHttpRequest_get_statusText
(
xhr
,
&
text
);
...
...
dlls/mshtml/xmlhttprequest.c
View file @
21043e5a
...
...
@@ -312,8 +312,23 @@ static HRESULT WINAPI HTMLXMLHttpRequest_get_responseXML(IHTMLXMLHttpRequest *if
static
HRESULT
WINAPI
HTMLXMLHttpRequest_get_status
(
IHTMLXMLHttpRequest
*
iface
,
LONG
*
p
)
{
HTMLXMLHttpRequest
*
This
=
impl_from_IHTMLXMLHttpRequest
(
iface
);
FIXME
(
"(%p)->(%p)
\n
"
,
This
,
p
);
return
E_NOTIMPL
;
DWORD
val
;
nsresult
nsres
;
TRACE
(
"(%p)->(%p)
\n
"
,
This
,
p
);
if
(
!
p
)
return
E_POINTER
;
nsres
=
nsIXMLHttpRequest_GetStatus
(
This
->
nsxhr
,
&
val
);
if
(
NS_FAILED
(
nsres
))
{
ERR
(
"nsIXMLHttpRequest_GetStatus failed: %08x
\n
"
,
nsres
);
return
E_FAIL
;
}
*
p
=
val
;
if
(
val
==
0
)
return
E_FAIL
;
/* WinAPI thinks this is an error */
return
S_OK
;
}
static
HRESULT
WINAPI
HTMLXMLHttpRequest_get_statusText
(
IHTMLXMLHttpRequest
*
iface
,
BSTR
*
p
)
...
...
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