wine-commits May 2012

wine-commits@winehq.org

2 participants
737 discussions

Henri Verbeet : wined3d: Properly preload index buffers.
by Alexandre Julliard 29 May '12

29 May '12

Module: wine Branch: master Commit: aa71065d9b4456cfd9099aa5fca70b711f84f217 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa71065d9b4456cfd9099aa5f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 28 18:17:25 2012 +0200 wined3d: Properly preload index buffers. --- dlls/wined3d/context.c | 7 +++++++ dlls/wined3d/device.c | 11 ++--------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index bba4112..4037c41 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2336,6 +2336,13 @@ BOOL context_apply_draw_state(struct wined3d_context *context, struct wined3d_de device_preload_textures(device); if (isStateDirty(context, STATE_VDECL) || isStateDirty(context, STATE_STREAMSRC)) device_update_stream_info(device, context->gl_info); + if (state->index_buffer && !state->user_stream) + { + if (device->strided_streams.all_vbo) + wined3d_buffer_preload(state->index_buffer); + else + buffer_get_sysmem(state->index_buffer, context->gl_info); + } ENTER_GL(); if (context->last_was_blit) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index f154e44..a0fbe86 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -447,15 +447,8 @@ void device_update_stream_info(struct wined3d_device *device, const struct wined } } - if (state->index_buffer && !state->user_stream) - { - if (prev_all_vbo != stream_info->all_vbo) - device_invalidate_state(device, STATE_INDEXBUFFER); - if (stream_info->all_vbo) - wined3d_buffer_preload(state->index_buffer); - else - buffer_get_sysmem(state->index_buffer, gl_info); - } + if (prev_all_vbo != stream_info->all_vbo) + device_invalidate_state(device, STATE_INDEXBUFFER); } static void device_preload_texture(const struct wined3d_state *state, unsigned int idx)

1 0

André Hentschel : kernel32: Add stub for SetThreadStackGuarantee.
by Alexandre Julliard 29 May '12

29 May '12

Module: wine Branch: master Commit: 5e5b435e7da091e493a046ccb632e40b98937bee URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e5b435e7da091e493a046ccb… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon May 28 14:18:09 2012 +0200 kernel32: Add stub for SetThreadStackGuarantee. --- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/thread.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index e5a70cf..842fc41 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1160,6 +1160,7 @@ @ stdcall SetThreadPreferredUILanguages(long ptr ptr) @ stdcall SetThreadPriority(long long) @ stdcall SetThreadPriorityBoost(long long) +@ stdcall SetThreadStackGuarantee(ptr) @ stdcall SetThreadUILanguage(long) @ stdcall SetTimeZoneInformation(ptr) @ stub SetTimerQueueTimer diff --git a/dlls/kernel32/thread.c b/dlls/kernel32/thread.c index f990af8..bdaaee8 100644 --- a/dlls/kernel32/thread.c +++ b/dlls/kernel32/thread.c @@ -373,6 +373,16 @@ BOOL WINAPI SetThreadPriorityBoost( /********************************************************************** + * SetThreadStackGuarantee (KERNEL32.@) + */ +BOOL WINAPI SetThreadStackGuarantee(PULONG stacksize) +{ + FIXME("(%p): stub\n", stacksize); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/********************************************************************** * SetThreadAffinityMask (KERNEL32.@) */ DWORD_PTR WINAPI SetThreadAffinityMask( HANDLE hThread, DWORD_PTR dwThreadAffinityMask )

1 0

Jacek Caban : wininet: Get rid of no longer used serverName and serverPort from http_session_t.
by Alexandre Julliard 29 May '12

29 May '12

Module: wine Branch: master Commit: 2ed97ebe43ef637605ebca25197a39acd1cdd60d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ed97ebe43ef637605ebca251… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 28 13:55:13 2012 +0200 wininet: Get rid of no longer used serverName and serverPort from http_session_t. --- dlls/wininet/http.c | 7 ++----- dlls/wininet/internet.h | 2 -- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index f08ab6d..74c9006 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3086,11 +3086,11 @@ static DWORD HTTP_HttpOpenRequestW(http_session_t *session, request->session = session; list_add_head( &session->hdr.children, &request->hdr.entry ); - port = session->serverPort; + port = session->hostPort; if(port == INTERNET_INVALID_PORT_NUMBER) port = dwFlags & INTERNET_FLAG_SECURE ? INTERNET_DEFAULT_HTTPS_PORT : INTERNET_DEFAULT_HTTP_PORT; - request->server = get_server(session->serverName, port); + request->server = get_server(session->hostName, port); if(!request->server) { WININET_Release(&request->hdr); return ERROR_OUTOFMEMORY; @@ -5450,7 +5450,6 @@ static void HTTPSESSION_Destroy(object_header_t *hdr) WININET_Release(&session->appInfo->hdr); heap_free(session->hostName); - heap_free(session->serverName); heap_free(session->password); heap_free(session->userName); } @@ -5602,13 +5601,11 @@ DWORD HTTP_Connect(appinfo_t *hIC, LPCWSTR lpszServerName, if(hIC->proxyBypass) FIXME("Proxy bypass is ignored.\n"); } - session->serverName = heap_strdupW(lpszServerName); session->hostName = heap_strdupW(lpszServerName); if (lpszUserName && lpszUserName[0]) session->userName = heap_strdupW(lpszUserName); if (lpszPassword && lpszPassword[0]) session->password = heap_strdupW(lpszPassword); - session->serverPort = serverPort; session->hostPort = serverPort; session->connect_timeout = hIC->connect_timeout; session->send_timeout = INFINITE; diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index fd6b5f7..2e59720 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -269,11 +269,9 @@ typedef struct object_header_t hdr; appinfo_t *appInfo; LPWSTR hostName; /* the final destination of the request */ - LPWSTR serverName; /* the name of the server we directly connect to */ LPWSTR userName; LPWSTR password; INTERNET_PORT hostPort; /* the final destination port of the request */ - INTERNET_PORT serverPort; /* the port of the server we directly connect to */ DWORD connect_timeout; DWORD send_timeout; DWORD receive_timeout;

1 0

Jacek Caban : wininet: Fixed grouping security error flags.
by Alexandre Julliard 29 May '12

29 May '12

Module: wine Branch: master Commit: a24b5588d23b61a6e769f53996610c75f0de6af4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a24b5588d23b61a6e769f5399… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 28 13:55:00 2012 +0200 wininet: Fixed grouping security error flags. --- dlls/wininet/internet.h | 4 ++-- dlls/wininet/netconnection.c | 34 ++++++++++++++++++++-------------- 2 files changed, 22 insertions(+), 16 deletions(-) diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 230e8d8..fd6b5f7 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -561,11 +561,11 @@ typedef struct } wininet_flag_info; /* Undocumented security flags */ -#define _SECURITY_FLAG_CERT_INVALID_CA 0x00800000 +#define _SECURITY_FLAG_CERT_REV_FAILED 0x00800000 #define _SECURITY_FLAG_CERT_INVALID_CN 0x02000000 #define _SECURITY_ERROR_FLAGS_MASK \ - (_SECURITY_FLAG_CERT_INVALID_CA \ + (_SECURITY_FLAG_CERT_REV_FAILED \ |_SECURITY_FLAG_CERT_INVALID_CN) #endif /* _WINE_INTERNET_H_ */ diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 8117884..ceed17a 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -249,7 +249,7 @@ static DWORD netconn_verify_cert(netconn_t *conn, PCCERT_CONTEXT cert, HCERTSTOR if (chain->TrustStatus.dwErrorStatus & ~supportedErrors) { if(conn->mask_errors) WARN("CERT_TRUST_IS_NOT_TIME_VALID, unknown error flags\n"); - err = ERROR_INTERNET_SEC_INVALID_CERT; + err = conn->mask_errors && err ? ERROR_INTERNET_SEC_CERT_ERRORS : ERROR_INTERNET_SEC_INVALID_CERT; errors &= supportedErrors; } @@ -257,23 +257,31 @@ static DWORD netconn_verify_cert(netconn_t *conn, PCCERT_CONTEXT cert, HCERTSTOR if(conn->mask_errors) WARN("CERT_TRUST_IS_NOT_TIME_VALID, unknown error flags\n"); if(!(conn->security_flags & SECURITY_FLAG_IGNORE_CERT_DATE_INVALID)) - err = ERROR_INTERNET_SEC_CERT_DATE_INVALID; + err = conn->mask_errors && err ? ERROR_INTERNET_SEC_CERT_ERRORS : ERROR_INTERNET_SEC_CERT_DATE_INVALID; errors &= ~CERT_TRUST_IS_NOT_TIME_VALID; } - if(errors & (CERT_TRUST_IS_UNTRUSTED_ROOT | CERT_TRUST_IS_PARTIAL_CHAIN)) { + if(errors & CERT_TRUST_IS_UNTRUSTED_ROOT) { if(conn->mask_errors) - conn->security_flags |= _SECURITY_FLAG_CERT_INVALID_CA; + WARN("CERT_TRUST_IS_UNTRUSTED_ROOT, unknown flags\n"); if(!(conn->security_flags & SECURITY_FLAG_IGNORE_UNKNOWN_CA)) - err = ERROR_INTERNET_INVALID_CA; - errors &= ~(CERT_TRUST_IS_UNTRUSTED_ROOT | CERT_TRUST_IS_PARTIAL_CHAIN); + err = conn->mask_errors && err ? ERROR_INTERNET_SEC_CERT_ERRORS : ERROR_INTERNET_INVALID_CA; + errors &= ~CERT_TRUST_IS_UNTRUSTED_ROOT; + } + + if(errors & CERT_TRUST_IS_PARTIAL_CHAIN) { + if(conn->mask_errors) + conn->security_flags |= _SECURITY_FLAG_CERT_REV_FAILED; + if(!(conn->security_flags & SECURITY_FLAG_IGNORE_UNKNOWN_CA)) + err = conn->mask_errors && err ? ERROR_INTERNET_SEC_CERT_ERRORS : ERROR_INTERNET_SEC_CERT_REV_FAILED; + errors &= ~CERT_TRUST_IS_PARTIAL_CHAIN; } if(errors & (CERT_TRUST_IS_OFFLINE_REVOCATION | CERT_TRUST_REVOCATION_STATUS_UNKNOWN)) { if(conn->mask_errors) WARN("TRUST_IS_OFFLINE_REVOCATION | CERT_TRUST_REVOCATION_STATUS_UNKNOWN, unknown error flags\n"); if(!(conn->security_flags & SECURITY_FLAG_IGNORE_REVOCATION)) - err = ERROR_INTERNET_SEC_CERT_NO_REV; + err = conn->mask_errors && err ? ERROR_INTERNET_SEC_CERT_ERRORS : ERROR_INTERNET_SEC_CERT_NO_REV; errors &= ~(CERT_TRUST_IS_OFFLINE_REVOCATION | CERT_TRUST_REVOCATION_STATUS_UNKNOWN); } @@ -281,7 +289,7 @@ static DWORD netconn_verify_cert(netconn_t *conn, PCCERT_CONTEXT cert, HCERTSTOR if(conn->mask_errors) WARN("TRUST_IS_OFFLINE_REVOCATION | CERT_TRUST_REVOCATION_STATUS_UNKNOWN, unknown error flags\n"); if(!(conn->security_flags & SECURITY_FLAG_IGNORE_REVOCATION)) - err = ERROR_INTERNET_SEC_CERT_REVOKED; + err = conn->mask_errors && err ? ERROR_INTERNET_SEC_CERT_ERRORS : ERROR_INTERNET_SEC_CERT_REVOKED; errors &= ~CERT_TRUST_IS_REVOKED; } @@ -289,7 +297,7 @@ static DWORD netconn_verify_cert(netconn_t *conn, PCCERT_CONTEXT cert, HCERTSTOR if(conn->mask_errors) WARN("CERT_TRUST_IS_NOT_VALID_FOR_USAGE, unknown error flags\n"); if(!(conn->security_flags & SECURITY_FLAG_IGNORE_WRONG_USAGE)) - err = ERROR_INTERNET_SEC_INVALID_CERT; + err = conn->mask_errors && err ? ERROR_INTERNET_SEC_CERT_ERRORS : ERROR_INTERNET_SEC_INVALID_CERT; errors &= ~CERT_TRUST_IS_NOT_VALID_FOR_USAGE; } @@ -321,11 +329,11 @@ static DWORD netconn_verify_cert(netconn_t *conn, PCCERT_CONTEXT cert, HCERTSTOR if(policyStatus.dwError == CERT_E_CN_NO_MATCH) { if(conn->mask_errors) conn->security_flags |= _SECURITY_FLAG_CERT_INVALID_CN; - err = ERROR_INTERNET_SEC_CERT_CN_INVALID; + err = conn->mask_errors && err ? ERROR_INTERNET_SEC_CERT_ERRORS : ERROR_INTERNET_SEC_CERT_CN_INVALID; }else if(policyStatus.dwError) { if(conn->mask_errors) WARN("unknown error flags for policy status %x\n", policyStatus.dwError); - err = ERROR_INTERNET_SEC_INVALID_CERT; + err = conn->mask_errors && err ? ERROR_INTERNET_SEC_CERT_ERRORS : ERROR_INTERNET_SEC_INVALID_CERT; } }else { err = GetLastError(); @@ -336,10 +344,8 @@ static DWORD netconn_verify_cert(netconn_t *conn, PCCERT_CONTEXT cert, HCERTSTOR if(err) { WARN("failed %u\n", err); - if(conn->mask_errors) { + if(conn->mask_errors) conn->server->security_flags |= conn->security_flags & _SECURITY_ERROR_FLAGS_MASK; - return err == ERROR_INTERNET_INVALID_CA ? ERROR_INTERNET_SEC_CERT_REV_FAILED : ERROR_INTERNET_SEC_CERT_ERRORS; - } return err; }

1 0

Jacek Caban : wininet: Handle error flags only for masked-error mode.
by Alexandre Julliard 29 May '12

29 May '12

Module: wine Branch: master Commit: 79259064c9c9cd754dfc246988b9626bbcd1f3b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79259064c9c9cd754dfc24698… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 28 13:54:32 2012 +0200 wininet: Handle error flags only for masked-error mode. --- dlls/wininet/netconnection.c | 32 ++++++++++++++------- dlls/wininet/tests/http.c | 61 +++++++++++++++++++++++++++++++++++++---- 2 files changed, 76 insertions(+), 17 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 238d365..8117884 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -247,41 +247,47 @@ static DWORD netconn_verify_cert(netconn_t *conn, PCCERT_CONTEXT cert, HCERTSTOR errors = chain->TrustStatus.dwErrorStatus; if (chain->TrustStatus.dwErrorStatus & ~supportedErrors) { - WARN("CERT_TRUST_IS_NOT_TIME_VALID, unknown error flags\n"); + if(conn->mask_errors) + WARN("CERT_TRUST_IS_NOT_TIME_VALID, unknown error flags\n"); err = ERROR_INTERNET_SEC_INVALID_CERT; errors &= supportedErrors; } if(errors & CERT_TRUST_IS_NOT_TIME_VALID) { - WARN("CERT_TRUST_IS_NOT_TIME_VALID, unknown error flags\n"); + if(conn->mask_errors) + WARN("CERT_TRUST_IS_NOT_TIME_VALID, unknown error flags\n"); if(!(conn->security_flags & SECURITY_FLAG_IGNORE_CERT_DATE_INVALID)) err = ERROR_INTERNET_SEC_CERT_DATE_INVALID; errors &= ~CERT_TRUST_IS_NOT_TIME_VALID; } if(errors & (CERT_TRUST_IS_UNTRUSTED_ROOT | CERT_TRUST_IS_PARTIAL_CHAIN)) { - conn->security_flags |= _SECURITY_FLAG_CERT_INVALID_CA; + if(conn->mask_errors) + conn->security_flags |= _SECURITY_FLAG_CERT_INVALID_CA; if(!(conn->security_flags & SECURITY_FLAG_IGNORE_UNKNOWN_CA)) err = ERROR_INTERNET_INVALID_CA; errors &= ~(CERT_TRUST_IS_UNTRUSTED_ROOT | CERT_TRUST_IS_PARTIAL_CHAIN); } if(errors & (CERT_TRUST_IS_OFFLINE_REVOCATION | CERT_TRUST_REVOCATION_STATUS_UNKNOWN)) { - WARN("TRUST_IS_OFFLINE_REVOCATION | CERT_TRUST_REVOCATION_STATUS_UNKNOWN, unknown error flags\n"); + if(conn->mask_errors) + WARN("TRUST_IS_OFFLINE_REVOCATION | CERT_TRUST_REVOCATION_STATUS_UNKNOWN, unknown error flags\n"); if(!(conn->security_flags & SECURITY_FLAG_IGNORE_REVOCATION)) err = ERROR_INTERNET_SEC_CERT_NO_REV; errors &= ~(CERT_TRUST_IS_OFFLINE_REVOCATION | CERT_TRUST_REVOCATION_STATUS_UNKNOWN); } if(errors & CERT_TRUST_IS_REVOKED) { - WARN("TRUST_IS_OFFLINE_REVOCATION | CERT_TRUST_REVOCATION_STATUS_UNKNOWN, unknown error flags\n"); + if(conn->mask_errors) + WARN("TRUST_IS_OFFLINE_REVOCATION | CERT_TRUST_REVOCATION_STATUS_UNKNOWN, unknown error flags\n"); if(!(conn->security_flags & SECURITY_FLAG_IGNORE_REVOCATION)) err = ERROR_INTERNET_SEC_CERT_REVOKED; errors &= ~CERT_TRUST_IS_REVOKED; } if(errors & CERT_TRUST_IS_NOT_VALID_FOR_USAGE) { - WARN("CERT_TRUST_IS_NOT_VALID_FOR_USAGE, unknown error flags\n"); + if(conn->mask_errors) + WARN("CERT_TRUST_IS_NOT_VALID_FOR_USAGE, unknown error flags\n"); if(!(conn->security_flags & SECURITY_FLAG_IGNORE_WRONG_USAGE)) err = ERROR_INTERNET_SEC_INVALID_CERT; errors &= ~CERT_TRUST_IS_NOT_VALID_FOR_USAGE; @@ -313,10 +319,12 @@ static DWORD netconn_verify_cert(netconn_t *conn, PCCERT_CONTEXT cert, HCERTSTOR */ if(ret) { if(policyStatus.dwError == CERT_E_CN_NO_MATCH) { - conn->security_flags |= _SECURITY_FLAG_CERT_INVALID_CN; + if(conn->mask_errors) + conn->security_flags |= _SECURITY_FLAG_CERT_INVALID_CN; err = ERROR_INTERNET_SEC_CERT_CN_INVALID; }else if(policyStatus.dwError) { - WARN("unknown error flags for policy status %x\n", policyStatus.dwError); + if(conn->mask_errors) + WARN("unknown error flags for policy status %x\n", policyStatus.dwError); err = ERROR_INTERNET_SEC_INVALID_CERT; } }else { @@ -328,9 +336,10 @@ static DWORD netconn_verify_cert(netconn_t *conn, PCCERT_CONTEXT cert, HCERTSTOR if(err) { WARN("failed %u\n", err); - conn->server->security_flags |= conn->security_flags & _SECURITY_ERROR_FLAGS_MASK; - if(conn->mask_errors) + if(conn->mask_errors) { + conn->server->security_flags |= conn->security_flags & _SECURITY_ERROR_FLAGS_MASK; return err == ERROR_INTERNET_INVALID_CA ? ERROR_INTERNET_SEC_CERT_REV_FAILED : ERROR_INTERNET_SEC_CERT_ERRORS; + } return err; } @@ -772,7 +781,8 @@ DWORD NETCON_secure_connect(netconn_t *connection) connection->security_flags |= SECURITY_FLAG_STRENGTH_WEAK; connection->security_flags |= SECURITY_FLAG_SECURE; - connection->server->security_flags = connection->security_flags; + if(connection->mask_errors) + connection->server->security_flags = connection->security_flags; return ERROR_SUCCESS; fail: diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 2cfc2af..2e7b693 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -2929,12 +2929,63 @@ static void test_security_flags(void) ok(req != NULL, "HttpOpenRequest failed\n"); CHECK_NOTIFIED(INTERNET_STATUS_HANDLE_CREATED); + test_secflags_option(req, 0); + set_secflags(req, SECURITY_FLAG_IGNORE_UNKNOWN_CA|SECURITY_FLAG_IGNORE_REVOCATION); + test_secflags_option(req, SECURITY_FLAG_IGNORE_UNKNOWN_CA|SECURITY_FLAG_IGNORE_REVOCATION); + + SET_EXPECT(INTERNET_STATUS_RESOLVING_NAME); + SET_EXPECT(INTERNET_STATUS_NAME_RESOLVED); + SET_EXPECT(INTERNET_STATUS_CONNECTING_TO_SERVER); + SET_EXPECT(INTERNET_STATUS_CONNECTED_TO_SERVER); + SET_EXPECT(INTERNET_STATUS_SENDING_REQUEST); + SET_EXPECT(INTERNET_STATUS_REQUEST_SENT); + SET_EXPECT(INTERNET_STATUS_RECEIVING_RESPONSE); + SET_EXPECT(INTERNET_STATUS_RESPONSE_RECEIVED); + SET_EXPECT(INTERNET_STATUS_REQUEST_COMPLETE); + SET_OPTIONAL(INTERNET_STATUS_DETECTING_PROXY); + SET_OPTIONAL(INTERNET_STATUS_COOKIE_SENT); + + res = HttpSendRequest(req, NULL, 0, NULL, 0); + ok(!res && GetLastError() == ERROR_IO_PENDING, "HttpSendRequest failed: %u\n", GetLastError()); + + WaitForSingleObject(hCompleteEvent, INFINITE); + ok(req_error == ERROR_SUCCESS, "req_error = %d\n", req_error); + + todo_wine CHECK_NOT_NOTIFIED(INTERNET_STATUS_RESOLVING_NAME); + todo_wine CHECK_NOT_NOTIFIED(INTERNET_STATUS_NAME_RESOLVED); + CHECK_NOTIFIED(INTERNET_STATUS_CONNECTING_TO_SERVER); + CHECK_NOTIFIED(INTERNET_STATUS_CONNECTED_TO_SERVER); + CHECK_NOTIFIED(INTERNET_STATUS_SENDING_REQUEST); + CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_SENT); + CHECK_NOTIFIED(INTERNET_STATUS_RECEIVING_RESPONSE); + CHECK_NOTIFIED(INTERNET_STATUS_RESPONSE_RECEIVED); + CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_COMPLETE); + CLEAR_NOTIFIED(INTERNET_STATUS_DETECTING_PROXY); + CLEAR_NOTIFIED(INTERNET_STATUS_COOKIE_SENT); + + test_request_flags(req, 0); + test_secflags_option(req, SECURITY_FLAG_SECURE|SECURITY_FLAG_IGNORE_UNKNOWN_CA| + SECURITY_FLAG_IGNORE_REVOCATION|SECURITY_FLAG_STRENGTH_STRONG); + + res = InternetReadFile(req, buf, sizeof(buf), &size); + ok(res, "InternetReadFile failed: %u\n", GetLastError()); + ok(size, "size = 0\n"); + + /* Collect all existing persistent connections */ + res = InternetSetOptionA(NULL, INTERNET_OPTION_SETTINGS_CHANGED, NULL, 0); + ok(res, "InternetSetOption(INTERNET_OPTION_END_BROWSER_SESSION) failed: %u\n", GetLastError()); + + SET_EXPECT(INTERNET_STATUS_HANDLE_CREATED); + req = HttpOpenRequest(conn, "GET", "/tests/hello.html", NULL, NULL, NULL, + INTERNET_FLAG_SECURE|INTERNET_FLAG_KEEP_CONNECTION|INTERNET_FLAG_RELOAD|INTERNET_FLAG_NO_CACHE_WRITE, + 0xdeadbeef); + ok(req != NULL, "HttpOpenRequest failed\n"); + CHECK_NOTIFIED(INTERNET_STATUS_HANDLE_CREATED); + flags = INTERNET_ERROR_MASK_COMBINED_SEC_CERT|INTERNET_ERROR_MASK_LOGIN_FAILURE_DISPLAY_ENTITY_BODY; res = InternetSetOption(req, INTERNET_OPTION_ERROR_MASK, (void*)&flags, sizeof(flags)); ok(res, "InternetQueryOption(INTERNET_OPTION_ERROR_MASK failed: %u\n", GetLastError()); - SET_EXPECT(INTERNET_STATUS_RESOLVING_NAME); - SET_EXPECT(INTERNET_STATUS_NAME_RESOLVED); SET_EXPECT(INTERNET_STATUS_CONNECTING_TO_SERVER); SET_EXPECT(INTERNET_STATUS_CONNECTED_TO_SERVER); SET_EXPECT(INTERNET_STATUS_CLOSING_CONNECTION); @@ -2950,8 +3001,6 @@ static void test_security_flags(void) ok(req_error == ERROR_INTERNET_SEC_CERT_REV_FAILED || broken(req_error == ERROR_INTERNET_SEC_CERT_ERRORS), "req_error = %d\n", req_error); - todo_wine CHECK_NOT_NOTIFIED(INTERNET_STATUS_RESOLVING_NAME); - todo_wine CHECK_NOT_NOTIFIED(INTERNET_STATUS_NAME_RESOLVED); CHECK_NOTIFIED(INTERNET_STATUS_CONNECTING_TO_SERVER); CHECK_NOTIFIED(INTERNET_STATUS_CONNECTED_TO_SERVER); CHECK_NOTIFIED(INTERNET_STATUS_CLOSING_CONNECTION); @@ -2963,7 +3012,7 @@ static void test_security_flags(void) if(req_error != ERROR_INTERNET_SEC_CERT_REV_FAILED) { win_skip("Unexpected cert errors, skipping security flags tests\n"); - close_async_handle(ses, hCompleteEvent, 2); + close_async_handle(ses, hCompleteEvent, 3); CloseHandle(hCompleteEvent); return; } @@ -3013,7 +3062,7 @@ static void test_security_flags(void) ok(res, "InternetReadFile failed: %u\n", GetLastError()); ok(size, "size = 0\n"); - close_async_handle(ses, hCompleteEvent, 2); + close_async_handle(ses, hCompleteEvent, 3); /* Collect all existing persistent connections */ res = InternetSetOptionA(NULL, INTERNET_OPTION_SETTINGS_CHANGED, NULL, 0);

1 0

Jacek Caban : urlhist.idl: Added missing flags.
by Alexandre Julliard 29 May '12

29 May '12

Module: wine Branch: master Commit: ef309733709bf882887a5aaeac61a92fcf855b72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef309733709bf882887a5aaea… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 28 11:50:53 2012 +0200 urlhist.idl: Added missing flags. --- include/urlhist.idl | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/include/urlhist.idl b/include/urlhist.idl index 7d05901..955d7ff 100644 --- a/include/urlhist.idl +++ b/include/urlhist.idl @@ -21,6 +21,14 @@ import "oleidl.idl"; import "oaidl.idl"; import "docobj.idl"; +cpp_quote("#define STATURL_QUERYFLAG_ISCACHED 0x010000") +cpp_quote("#define STATURL_QUERYFLAG_NOURL 0x020000") +cpp_quote("#define STATURL_QUERYFLAG_NOTITLE 0x040000") +cpp_quote("#define STATURL_QUERYFLAG_TOPLEVEL 0x080000") + +cpp_quote("#define STATURLFLAG_ISCACHED 0x0001") +cpp_quote("#define STATURLFLAG_ISTOPLEVEL 0x0002") + typedef enum _ADDURL_FLAG { ADDURL_FIRST = 0, @@ -40,7 +48,7 @@ typedef enum _ADDURL_FLAG interface IEnumSTATURL : IUnknown { typedef [unique] IEnumSTATURL *LPENUMSTATURL; - + typedef struct _STATURL { DWORD cbSize; @@ -77,7 +85,7 @@ interface IEnumSTATURL : IUnknown interface IUrlHistoryStg : IUnknown { typedef [unique] IUrlHistoryStg *LPURLHISTORYSTG; - + HRESULT AddUrl( [in] LPCOLESTR pocsUrl, [in, unique] LPCOLESTR pocsTitle, @@ -91,14 +99,14 @@ interface IUrlHistoryStg : IUnknown [in] LPCOLESTR pocsUrl, [in] DWORD dwFlags, [in, out, unique] LPSTATURL lpSTATURL); - + HRESULT BindToObject( [in] LPCOLESTR pocsUrl, [in] REFIID riid, [out, iid_is(riid)] void **ppvOut); HRESULT EnumUrls( - [out] IEnumSTATURL **ppEnum); + [out] IEnumSTATURL **ppEnum); } /*****************************************************************************

1 0

Lucas Fialho Zawacki : Added portuguese translation for release 1.5.5
by Jeremy Newman 29 May '12

29 May '12

Module: website Branch: master Commit: a2000bb15017609b5157315db496b07c63954f0c URL: http://source.winehq.org/git/website.git/?a=commit;h=a2000bb15017609b515731… Author: Lucas Fialho Zawacki <lfzawacki(a)gmail.com> Date: Tue May 29 10:58:29 2012 -0300 Added portuguese translation for release 1.5.5 --- news/pt/2012052501.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/pt/2012052501.xml b/news/pt/2012052501.xml new file mode 100644 index 0000000..439ed70 --- /dev/null +++ b/news/pt/2012052501.xml @@ -0,0 +1,17 @@ +<news> +<date>25 de Maio de 2012</date> +<title>Wine 1.5.5 lançado</title> +<body> + A versão de desenvolvimento 1.5.5 já está disponível. + <a href="{$root}/announce/1.5.5">Novidades</a> desta versão: +<ul> + <li>Suporte à instalação do Mono como um pacote adicional do Wine.</li> + <li>Dithering de pincéis na engine DIB.</li> + <li>Suporte à instalação do ambiente de execução do .NET 4.0.</li> + <li>Suporte a arquivos DDS no D3DX9.</li> + <li>Várias correções de bugs.</li> +</ul> +O código fonte está <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.5.tar.bz2">disponível agora</a>. +Pacotes binários estão em processo de construção e em breve estarão em suas respectivas <a href="{$root}/download">sessões da área de downloads.</a>. +</body></news> +

1 0

Łukasz Wojniłowicz : Polish translation for release 1.5.5
by Jeremy Newman 29 May '12

29 May '12

Module: website Branch: master Commit: 056fb36dd0e61325451325256c777cdfbdad4423 URL: http://source.winehq.org/git/website.git/?a=commit;h=056fb36dd0e61325451325… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat May 26 13:48:15 2012 +0200 Polish translation for release 1.5.5 --- news/pl/2012052501.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/news/pl/2012052501.xml b/news/pl/2012052501.xml new file mode 100644 index 0000000..2013d4a --- /dev/null +++ b/news/pl/2012052501.xml @@ -0,0 +1,16 @@ +<news> +<date>Maj 25, 2012</date> +<title>Wydano Wine 1.5.5</title> +<body> + Wydanie rozwojowe Wine 1.5.5 jest już dostępne. + <a href="{$root}/announce/1.5.5">Co nowego</a> w tym wydaniu: +<ul> + <li>Wsparcie instalowania Mono jako dodatkowego pakietu do Wine.</li> + <li>Dithering pędzli wzorców w silniku DIB.</li> + <li>Obsługa instalowania bibliotek uruchomieniowych .NET 4.0.</li> + <li>Wsparcie dla plików DDS w D3DX9.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.5.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Eduardo García : Spanish translation for release 1.5.5
by Jeremy Newman 29 May '12

29 May '12

Module: website Branch: master Commit: 5a8098e3b4a3f012be22ebb29593dc5d6491c806 URL: http://source.winehq.org/git/website.git/?a=commit;h=5a8098e3b4a3f012be22eb… Author: Eduardo García <eduardo.garcia(a)gmx.com> Date: Sat May 26 10:31:21 2012 +0200 Spanish translation for release 1.5.5 With regards. Eduardo >From 933f99cab0af1df5fbc7a6d17ad25fbcf4674622 Mon Sep 17 00:00:00 2001 From: Eduardo García <eduardo.garcia(a)gmx.com> Date: Sat, 26 May 2012 10:22:55 +0200 Subject: Spanish translation for release 1.5.5 --- news/es/2012052501.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/news/es/2012052501.xml b/news/es/2012052501.xml new file mode 100644 index 0000000..980a3c7 --- /dev/null +++ b/news/es/2012052501.xml @@ -0,0 +1,16 @@ +<news> +<date>Mayo 25, 2012</date> +<title>Wine 1.5.5 Liberado</title> +<body> + La versión de desarrollo Wine 1.5.5 se encuentra ahora disponible. + <a href="{$root}/announce/1.5.5">Novedades</a> en esta versión: +<ul> + <li>Soporte para la instalación de Mono como un paquete add-on de Wine.</li> + <li>Tramado para pinceles de patrón en el motor DIB.</li> + <li>Soporte para la instalación del ejecutable .NET 4.0.</li> + <li>Soporte para archivos DDS en D3DX9.</li> + <li>Corrección de errores varios.</li> +</ul> +El <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.5.tar.bz2">código fuente</a> ya está disponible. +Los paquetes binarios están en proceso de construcción, y pronto aparecerán en sus respectivos <a href="{$root}/download">lugares de descarga</a>. +</body></news>

1 0

Frédéric Delanoy : French translation for release 1.5.5
by Jeremy Newman 29 May '12

29 May '12

Module: website Branch: master Commit: c1722b0fbc6c304b6db40e4377ea4916e233c31d URL: http://source.winehq.org/git/website.git/?a=commit;h=c1722b0fbc6c304b6db40e… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri May 25 22:59:25 2012 +0200 French translation for release 1.5.5 --- news/fr/2012052501.xml | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/news/fr/2012052501.xml b/news/fr/2012052501.xml new file mode 100644 index 0000000..154ec92 --- /dev/null +++ b/news/fr/2012052501.xml @@ -0,0 +1,15 @@ +<news> +<date>25 mai 2012</date> +<title>Sortie de Wine 1.5.5</title> +<body> + La version de développement 1.5.5 de Wine est disponible. + <a href="{$root}/announce/1.5.5">Nouveautés</a> de cette version : +<ul> + <li>Prise en charge de l'installation de Mono comme module externe à Wine.</li> + <li>Tramage des brosses modèles dans le moteur DIB.</li> + <li>Prise en charge de l'installation du moteur d'exécution .NET 4.0.</li> + <li>Fichiers DDS pris en charge dans D3DX9.</li> + <li>Diverses corrections de bogues.</li> +</ul> +Le <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.5.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
74
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2012