Jacek Caban : wininet: Merge GetLastError() test into other request tests.
Alexandre Julliard
julliard at winehq.org
Mon Mar 24 15:59:46 CDT 2014
Module: wine
Branch: master
Commit: 858caa9aa0c6ce7124e03894941bc1e8b7a301b9
URL: http://source.winehq.org/git/wine.git/?a=commit;h=858caa9aa0c6ce7124e03894941bc1e8b7a301b9
Author: Jacek Caban <jacek at codeweavers.com>
Date: Mon Mar 24 16:25:02 2014 +0100
wininet: Merge GetLastError() test into other request tests.
---
dlls/wininet/tests/http.c | 32 ++++----------------------------
1 file changed, 4 insertions(+), 28 deletions(-)
diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c
index e40cdb6..5edc55a 100644
--- a/dlls/wininet/tests/http.c
+++ b/dlls/wininet/tests/http.c
@@ -2213,7 +2213,7 @@ static DWORD CALLBACK server_thread(LPVOID param)
static void test_basic_request(int port, const char *verb, const char *url)
{
HINTERNET hi, hc, hr;
- DWORD r, count;
+ DWORD r, count, error;
char buffer[0x100];
hi = InternetOpenA(NULL, INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0);
@@ -2225,7 +2225,10 @@ static void test_basic_request(int port, const char *verb, const char *url)
hr = HttpOpenRequestA(hc, verb, url, NULL, NULL, NULL, 0, 0);
ok(hr != NULL, "HttpOpenRequest failed\n");
+ SetLastError(0xdeadbeef);
r = HttpSendRequestA(hr, NULL, 0, NULL, 0);
+ error = GetLastError();
+ ok(error == ERROR_SUCCESS || broken(error != ERROR_SUCCESS), "expected ERROR_SUCCESS, got %u\n", error);
ok(r, "HttpSendRequest failed\n");
count = 0;
@@ -2241,32 +2244,6 @@ static void test_basic_request(int port, const char *verb, const char *url)
InternetCloseHandle(hi);
}
-static void test_last_error(int port)
-{
- HINTERNET hi, hc, hr;
- DWORD error;
- BOOL r;
-
- hi = InternetOpenA(NULL, INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0);
- ok(hi != NULL, "open failed\n");
-
- hc = InternetConnectA(hi, "localhost", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0);
- ok(hc != NULL, "connect failed\n");
-
- hr = HttpOpenRequestA(hc, NULL, "/test1", NULL, NULL, NULL, 0, 0);
- ok(hr != NULL, "HttpOpenRequest failed\n");
-
- SetLastError(0xdeadbeef);
- r = HttpSendRequestA(hr, NULL, 0, NULL, 0);
- error = GetLastError();
- ok(r, "HttpSendRequest failed\n");
- ok(error == ERROR_SUCCESS || broken(error != ERROR_SUCCESS), "expected ERROR_SUCCESS, got %u\n", error);
-
- InternetCloseHandle(hr);
- InternetCloseHandle(hc);
- InternetCloseHandle(hi);
-}
-
static void test_proxy_indirect(int port)
{
HINTERNET hi, hc, hr;
@@ -3994,7 +3971,6 @@ static void test_http_connection(void)
test_response_without_headers(si.port);
test_HttpQueryInfo(si.port);
test_HttpSendRequestW(si.port);
- test_last_error(si.port);
test_options(si.port);
test_no_content(si.port);
test_conn_close(si.port);
More information about the wine-cvs
mailing list