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
70fb4ef5
Commit
70fb4ef5
authored
Aug 20, 2008
by
Hans Leidekker
Committed by
Alexandre Julliard
Aug 20, 2008
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
winhttp: Use default values for verb, object and version parameters in WinHttpOpenRequest.
parent
f14b6afb
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
13 deletions
+19
-13
session.c
dlls/winhttp/session.c
+11
-3
winhttp.c
dlls/winhttp/tests/winhttp.c
+8
-10
No files found.
dlls/winhttp/session.c
View file @
70fb4ef5
...
...
@@ -230,6 +230,10 @@ static const object_vtbl_t request_vtbl =
HINTERNET
WINAPI
WinHttpOpenRequest
(
HINTERNET
hconnect
,
LPCWSTR
verb
,
LPCWSTR
object
,
LPCWSTR
version
,
LPCWSTR
referrer
,
LPCWSTR
*
types
,
DWORD
flags
)
{
static
const
WCHAR
get
[]
=
{
'G'
,
'E'
,
'T'
,
0
};
static
const
WCHAR
slash
[]
=
{
'/'
,
0
};
static
const
WCHAR
http1_1
[]
=
{
'H'
,
'T'
,
'T'
,
'P'
,
'/'
,
'1'
,
'.'
,
'1'
,
0
};
request_t
*
request
;
connect_t
*
connect
;
HINTERNET
hrequest
=
NULL
;
...
...
@@ -264,9 +268,13 @@ HINTERNET WINAPI WinHttpOpenRequest( HINTERNET hconnect, LPCWSTR verb, LPCWSTR o
request
->
connect
=
connect
;
list_add_head
(
&
connect
->
hdr
.
children
,
&
request
->
hdr
.
entry
);
if
(
verb
&&
!
(
request
->
verb
=
strdupW
(
verb
)))
goto
end
;
if
(
object
&&
!
(
request
->
path
=
strdupW
(
object
)))
goto
end
;
if
(
version
&&
!
(
request
->
version
=
strdupW
(
version
)))
goto
end
;
if
(
!
verb
)
verb
=
get
;
if
(
!
object
)
object
=
slash
;
if
(
!
version
)
version
=
http1_1
;
if
(
!
(
request
->
verb
=
strdupW
(
verb
)))
goto
end
;
if
(
!
(
request
->
path
=
strdupW
(
object
)))
goto
end
;
if
(
!
(
request
->
version
=
strdupW
(
version
)))
goto
end
;
if
(
!
(
hrequest
=
alloc_handle
(
&
request
->
hdr
)))
goto
end
;
request
->
hdr
.
handle
=
hrequest
;
...
...
dlls/winhttp/tests/winhttp.c
View file @
70fb4ef5
...
...
@@ -17,6 +17,7 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <stdarg.h>
#include <stdlib.h>
#include <windef.h>
...
...
@@ -277,7 +278,7 @@ static void test_WinHttpAddHeaders(void)
test_header_name
,
NULL
,
&
len
,
&
index
);
ok
(
ret
==
FALSE
,
"WinHttpQueryHeaders unexpectedly succeeded.
\n
"
);
todo_wine
ok
(
GetLastError
()
==
ERROR_INSUFFICIENT_BUFFER
,
"Expected ERROR_INSUFFICIENT_BUFFER, got %u
\n
"
,
GetLastError
());
todo_wine
ok
(
len
>
40
,
"WinHttpQueryHeaders returned invalid length: expected greater than 40, got %d
\n
"
,
len
);
ok
(
len
>
40
,
"WinHttpQueryHeaders returned invalid length: expected greater than 40, got %d
\n
"
,
len
);
ok
(
index
==
0
,
"WinHttpQueryHeaders incorrectly incremented header index.
\n
"
);
/* Try with a NULL buffer and a length thats too small */
...
...
@@ -289,7 +290,7 @@ static void test_WinHttpAddHeaders(void)
ok
(
ret
==
FALSE
,
"WinHttpQueryHeaders unexpectedly succeeded.
\n
"
);
ok
(
GetLastError
()
==
ERROR_INSUFFICIENT_BUFFER
,
"WinHttpQueryHeaders set incorrect error: expected ERROR_INSUFFICENT_BUFFER, go %u
\n
"
,
GetLastError
());
todo_wine
ok
(
len
>
40
,
"WinHttpQueryHeaders returned invalid length: expected greater than 40, got %d
\n
"
,
len
);
ok
(
len
>
40
,
"WinHttpQueryHeaders returned invalid length: expected greater than 40, got %d
\n
"
,
len
);
ok
(
index
==
0
,
"WinHttpQueryHeaders incorrectly incremented header index.
\n
"
);
index
=
0
;
...
...
@@ -300,7 +301,7 @@ static void test_WinHttpAddHeaders(void)
ok
(
ret
==
FALSE
,
"WinHttpQueryHeaders unexpectedly succeeded.
\n
"
);
ok
(
GetLastError
()
==
ERROR_INSUFFICIENT_BUFFER
,
"WinHttpQueryHeaders set incorrect error: expected ERROR_INSUFFICIENT_BUFFER, got %u
\n
"
,
GetLastError
());
todo_wine
ok
(
len
>
40
,
"WinHttpQueryHeaders returned invalid length: expected greater than 40, got %d
\n
"
,
len
);
ok
(
len
>
40
,
"WinHttpQueryHeaders returned invalid length: expected greater than 40, got %d
\n
"
,
len
);
ok
(
index
==
0
,
"WinHttpQueryHeaders failed: index was incremented.
\n
"
);
/* valid query */
...
...
@@ -314,13 +315,10 @@ static void test_WinHttpAddHeaders(void)
ok
(
len
+
sizeof
(
WCHAR
)
<=
oldlen
,
"WinHttpQueryHeaders resulting length longer than advertized.
\n
"
);
ok
((
len
<
sizeof
(
buffer
)
-
sizeof
(
WCHAR
))
&&
buffer
[
len
/
sizeof
(
WCHAR
)]
==
0
,
"WinHttpQueryHeaders did not append NULL terminator
\n
"
);
ok
(
len
==
lstrlenW
(
buffer
)
*
sizeof
(
WCHAR
),
"WinHttpQueryHeaders returned incorrect length.
\n
"
);
todo_wine
{
ok
(
memcmp
(
buffer
,
test_header_begin
,
sizeof
(
test_header_begin
))
==
0
,
"WinHttpQueryHeaders returned invalid beginning of header string.
\n
"
);
ok
(
memcmp
(
buffer
+
lstrlenW
(
buffer
)
-
4
,
test_header_end
,
sizeof
(
test_header_end
))
==
0
,
"WinHttpQueryHeaders returned invalid end of header string.
\n
"
);
}
ok
(
memcmp
(
buffer
,
test_header_begin
,
sizeof
(
test_header_begin
))
==
0
,
"WinHttpQueryHeaders returned invalid beginning of header string.
\n
"
);
ok
(
memcmp
(
buffer
+
lstrlenW
(
buffer
)
-
4
,
test_header_end
,
sizeof
(
test_header_end
))
==
0
,
"WinHttpQueryHeaders returned invalid end of header string.
\n
"
);
ok
(
index
==
0
,
"WinHttpQueryHeaders incremented header index.
\n
"
);
/* tests for more indices */
...
...
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