December 2009 - Wine-commits

Jacek Caban : urlmon: Added support for BINDSTATUS_REDIRECTING.
by Alexandre Julliard 16 Dec '09

16 Dec '09

Module: wine Branch: master Commit: efd869e00ac7ad86a3e8ce32181c56c07a2404c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=efd869e00ac7ad86a3e8ce321… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 15 21:15:28 2009 +0100 urlmon: Added support for BINDSTATUS_REDIRECTING. --- dlls/urlmon/binding.c | 3 +++ dlls/urlmon/bindprot.c | 1 + dlls/urlmon/tests/url.c | 25 +++++++++++++++++++++++-- 3 files changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index 210e8e2..fc21d11 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -967,6 +967,9 @@ static HRESULT WINAPI InternetProtocolSink_ReportProgress(IInternetProtocolSink case BINDSTATUS_CONNECTING: on_progress(This, 0, 0, BINDSTATUS_CONNECTING, szStatusText); break; + case BINDSTATUS_REDIRECTING: + on_progress(This, 0, 0, BINDSTATUS_REDIRECTING, szStatusText); + break; case BINDSTATUS_BEGINDOWNLOADDATA: fill_stgmed_buffer(This->stgmed_buf); break; diff --git a/dlls/urlmon/bindprot.c b/dlls/urlmon/bindprot.c index 20472ba..07d6fc2 100644 --- a/dlls/urlmon/bindprot.c +++ b/dlls/urlmon/bindprot.c @@ -960,6 +960,7 @@ static void report_progress(BindProtocol *This, ULONG status_code, LPCWSTR statu switch(status_code) { case BINDSTATUS_FINDINGRESOURCE: case BINDSTATUS_CONNECTING: + case BINDSTATUS_REDIRECTING: case BINDSTATUS_BEGINDOWNLOADDATA: case BINDSTATUS_SENDINGREQUEST: case BINDSTATUS_CACHEFILENAMEAVAILABLE: diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 5a2a8fb..ba0c134 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -100,6 +100,7 @@ DEFINE_EXPECT(GetBindInfoEx); DEFINE_EXPECT(OnStartBinding); DEFINE_EXPECT(OnProgress_FINDINGRESOURCE); DEFINE_EXPECT(OnProgress_CONNECTING); +DEFINE_EXPECT(OnProgress_REDIRECTING); DEFINE_EXPECT(OnProgress_SENDINGREQUEST); DEFINE_EXPECT(OnProgress_MIMETYPEAVAILABLE); DEFINE_EXPECT(OnProgress_BEGINDOWNLOADDATA); @@ -181,6 +182,7 @@ static IBinding *current_binding; static HANDLE complete_event, complete_event2; static HRESULT binding_hres; static BOOL have_IHttpNegotiate2, use_bscex; +static BOOL test_redirect; static LPCWSTR urls[] = { WINE_ABOUT_URL, @@ -380,13 +382,21 @@ static DWORD WINAPI thread_proc(PVOID arg) SET_EXPECT(OnProgress_SENDINGREQUEST); hres = IInternetProtocolSink_ReportProgress(protocol_sink, BINDSTATUS_SENDINGREQUEST, NULL); - ok(hres == S_OK, "ReportProxgress failed: %08x\n", hres); + ok(hres == S_OK, "ReportProgress failed: %08x\n", hres); WaitForSingleObject(complete_event, INFINITE); if(bind_to_object) CHECK_CALLED(Obj_OnProgress_SENDINGREQUEST); else CHECK_CALLED(OnProgress_SENDINGREQUEST); + if(test_redirect) { + SET_EXPECT(OnProgress_REDIRECTING); + hres = IInternetProtocolSink_ReportProgress(protocol_sink, BINDSTATUS_REDIRECTING, WINE_ABOUT_URL); + ok(hres == S_OK, "ReportProgress(BINDSTATUS_REFIRECTING) failed: %08x\n", hres); + WaitForSingleObject(complete_event, INFINITE); + CHECK_CALLED(OnProgress_REDIRECTING); + } + test_switch_fail(); SET_EXPECT(Continue); @@ -773,7 +783,7 @@ static HRESULT WINAPI Protocol_Continue(IInternetProtocol *iface, IHttpNegotiate_Release(http_negotiate); ok(hres == S_OK, "OnResponse failed: %08x\n", hres); - if(test_protocol == HTTPS_TEST) { + if(test_protocol == HTTPS_TEST || test_redirect) { hres = IInternetProtocolSink_ReportProgress(protocol_sink, BINDSTATUS_ACCEPTRANGES, NULL); ok(hres == S_OK, "ReportProgress(BINDSTATUS_ACCEPTRANGES) failed: %08x\n", hres); } @@ -1275,6 +1285,12 @@ static HRESULT WINAPI statusclb_OnProgress(IBindStatusCallbackEx *iface, ULONG u if((bindf & BINDF_ASYNCHRONOUS) && emulate_protocol) SetEvent(complete_event); break; + case BINDSTATUS_REDIRECTING: + CHECK_EXPECT(OnProgress_REDIRECTING); + ok(!lstrcmpW(szStatusText, WINE_ABOUT_URL), "unexpected status text %s\n", + wine_dbgstr_w(szStatusText)); + SetEvent(complete_event); + break; case BINDSTATUS_SENDINGREQUEST: if(iface == &objbsc) CHECK_EXPECT(Obj_OnProgress_SENDINGREQUEST); @@ -2188,6 +2204,7 @@ static BOOL test_RegisterBindStatusCallback(void) #define BINDTEST_TOOBJECT 0x0002 #define BINDTEST_FILEDWLAPI 0x0004 #define BINDTEST_HTTPRESPONSE 0x0008 +#define BINDTEST_REDIRECT 0x0010 static void init_bind_test(int protocol, DWORD flags, DWORD t) { @@ -2206,6 +2223,7 @@ static void init_bind_test(int protocol, DWORD flags, DWORD t) urls[HTTP_TEST] = SHORT_RESPONSE_URL; else urls[HTTP_TEST] = WINE_ABOUT_URL; + test_redirect = (flags & BINDTEST_REDIRECT) != 0; } static void test_BindToStorage(int protocol, DWORD flags, DWORD t) @@ -2893,6 +2911,9 @@ START_TEST(url) trace("emulated http test (to file)...\n"); test_BindToStorage(HTTP_TEST, BINDTEST_EMULATE, TYMED_FILE); + trace("emulated http test (redirect)...\n"); + test_BindToStorage(HTTP_TEST, BINDTEST_EMULATE|BINDTEST_REDIRECT, TYMED_ISTREAM); + trace("asynchronous https test...\n"); test_BindToStorage(HTTPS_TEST, 0, TYMED_ISTREAM);

1 0

Alexandre Julliard : user32: Move more 16-bit winproc functions inside the i386 ifdef.
by Alexandre Julliard 16 Dec '09

16 Dec '09

Module: wine Branch: master Commit: 73c93466a24ef0757142a01eee713fff8757d3b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73c93466a24ef0757142a01ee… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 15 20:09:04 2009 +0100 user32: Move more 16-bit winproc functions inside the i386 ifdef. --- dlls/user32/winproc.c | 367 ++++++++++++++++++++++++------------------------- 1 files changed, 181 insertions(+), 186 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=73c93466a24ef0757142a…

1 0

Alexandre Julliard : user32: Store the 16-bit winproc in a different array from the 32-bit A/W ones.
by Alexandre Julliard 16 Dec '09

16 Dec '09

Module: wine Branch: master Commit: fc0244cb32b5db1b075fd008a23e3c35324b9a96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc0244cb32b5db1b075fd008a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 15 20:11:16 2009 +0100 user32: Store the 16-bit winproc in a different array from the 32-bit A/W ones. --- dlls/user32/winproc.c | 245 ++++++++++++++++++++++-------------------------- 1 files changed, 112 insertions(+), 133 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fc0244cb32b5db1b075fd…

1 0

Alexandre Julliard : user32: Move 16-bit winproc functions to msg16.c.
by Alexandre Julliard 16 Dec '09

16 Dec '09

Module: wine Branch: master Commit: 552fc29b2613f0169f0680339bdf619442323ebc URL: http://source.winehq.org/git/wine.git/?a=commit;h=552fc29b2613f0169f0680339… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 15 20:01:38 2009 +0100 user32: Move 16-bit winproc functions to msg16.c. --- dlls/user32/controls.h | 3 + dlls/user32/msg16.c | 275 +++++++++++++++++++++++++++++++++++++++++++++ dlls/user32/winproc.c | 292 ++---------------------------------------------- 3 files changed, 287 insertions(+), 283 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=552fc29b2613f0169f068…

1 0

Alexandre Julliard : user32: Move the 16-bit message mapping functions to msg16.c.
by Alexandre Julliard 16 Dec '09

16 Dec '09

Module: wine Branch: master Commit: fb97908119a62d9ce05ac7dd8d414dd0bcb9ef31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb97908119a62d9ce05ac7dd8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 15 20:18:47 2009 +0100 user32: Move the 16-bit message mapping functions to msg16.c. --- dlls/user32/msg16.c | 1055 +++++++++++++++++++++++++++++++++++++++++++++++++ dlls/user32/winproc.c | 1045 ------------------------------------------------ 2 files changed, 1055 insertions(+), 1045 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fb97908119a62d9ce05ac…

1 0

Juan Lang : wininet: Return error directly from netconn_verify_cert.
by Alexandre Julliard 16 Dec '09

16 Dec '09

Module: wine Branch: master Commit: bd5c5953f35ff9a164c93cfbfe77603b199a0b9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd5c5953f35ff9a164c93cfbf… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Dec 14 15:58:44 2009 -0800 wininet: Return error directly from netconn_verify_cert. --- dlls/wininet/netconnection.c | 22 +++++++++++++--------- 1 files changed, 13 insertions(+), 9 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 39ef464..f897570 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -210,7 +210,7 @@ static PCCERT_CONTEXT X509_to_cert_context(X509 *cert) return ret; } -static BOOL netconn_verify_cert(PCCERT_CONTEXT cert, HCERTSTORE store, +static DWORD netconn_verify_cert(PCCERT_CONTEXT cert, HCERTSTORE store, WCHAR *server) { BOOL ret; @@ -218,7 +218,7 @@ static BOOL netconn_verify_cert(PCCERT_CONTEXT cert, HCERTSTORE store, PCCERT_CHAIN_CONTEXT chain; char oid_server_auth[] = szOID_PKIX_KP_SERVER_AUTH; char *server_auth[] = { oid_server_auth }; - DWORD err; + DWORD err = ERROR_SUCCESS; TRACE("verifying %s\n", debugstr_w(server)); chainPara.RequestedUsage.Usage.cUsageIdentifier = 1; @@ -245,8 +245,6 @@ static BOOL netconn_verify_cert(PCCERT_CONTEXT cert, HCERTSTORE store, err = ERROR_INTERNET_SEC_INVALID_CERT; else err = ERROR_INTERNET_SEC_INVALID_CERT; - INTERNET_SetLastError(err); - ret = FALSE; } else { @@ -271,14 +269,12 @@ static BOOL netconn_verify_cert(PCCERT_CONTEXT cert, HCERTSTORE store, err = ERROR_INTERNET_SEC_CERT_CN_INVALID; else err = ERROR_INTERNET_SEC_INVALID_CERT; - INTERNET_SetLastError(err); - ret = FALSE; } } CertFreeCertificateChain(chain); } - TRACE("returning %d\n", ret); - return ret; + TRACE("returning %08x\n", err); + return err; } static int netconn_secure_verify(int preverify_ok, X509_STORE_CTX *ctx) @@ -320,7 +316,15 @@ static int netconn_secure_verify(int preverify_ok, X509_STORE_CTX *ctx) } if (!endCert) ret = FALSE; if (ret) - ret = netconn_verify_cert(endCert, store, server); + { + DWORD err = netconn_verify_cert(endCert, store, server); + + if (err) + { + INTERNET_SetLastError(err); + ret = FALSE; + } + } CertFreeCertificateContext(endCert); CertCloseStore(store, 0); }

1 0

Juan Lang : wininet: Set error and fail if a secure connection' s certificate couldn't be verified.
by Alexandre Julliard 16 Dec '09

16 Dec '09

Module: wine Branch: master Commit: 09246aa1a73f039bc6676a890781a06f351a3e0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=09246aa1a73f039bc6676a890… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Dec 14 16:02:33 2009 -0800 wininet: Set error and fail if a secure connection's certificate couldn't be verified. --- dlls/wininet/netconnection.c | 19 +++++++++++++++---- 1 files changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index f897570..db57e1d 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -116,6 +116,7 @@ static void *OpenSSL_crypto_handle; static SSL_METHOD *meth; static SSL_CTX *ctx; static int hostname_idx; +static int error_idx; #define MAKE_FUNCPTR(f) static typeof(f) * p##f @@ -321,7 +322,7 @@ static int netconn_secure_verify(int preverify_ok, X509_STORE_CTX *ctx) if (err) { - INTERNET_SetLastError(err); + pSSL_set_ex_data(ssl, error_idx, (void *)err); ret = FALSE; } } @@ -445,6 +446,15 @@ DWORD NETCON_init(WININET_NETCONNECTION *connection, BOOL useSSL) LeaveCriticalSection(&init_ssl_cs); return ERROR_OUTOFMEMORY; } + error_idx = pSSL_get_ex_new_index(0, (void *)"error index", + NULL, NULL, NULL); + if (error_idx == -1) + { + ERR("SSL_get_ex_new_index failed; %s\n", + pERR_error_string(pERR_get_error(), 0)); + LeaveCriticalSection(&init_ssl_cs); + return ERROR_OUTOFMEMORY; + } pSSL_CTX_set_verify(ctx, SSL_VERIFY_PEER, netconn_secure_verify); pCRYPTO_set_id_callback(ssl_thread_id); @@ -650,9 +660,10 @@ DWORD NETCON_secure_connect(WININET_NETCONNECTION *connection, LPWSTR hostname) if (pSSL_connect(connection->ssl_s) <= 0) { - ERR("SSL_connect failed: %s\n", - pERR_error_string(pERR_get_error(), 0)); - res = ERROR_INTERNET_SECURITY_CHANNEL_ERROR; + res = (DWORD)pSSL_get_ex_data(connection->ssl_s, error_idx); + if (!res) + res = ERROR_INTERNET_SECURITY_CHANNEL_ERROR; + ERR("SSL_connect failed: %d\n", res); goto fail; } pSSL_set_ex_data(connection->ssl_s, hostname_idx, hostname);

1 0

Huw Davies : dbghelp: Fix compilation on OSX.
by Alexandre Julliard 16 Dec '09

16 Dec '09

Module: wine Branch: master Commit: 34a961d3af02319e3707e1f692d157310f31049e URL: http://source.winehq.org/git/wine.git/?a=commit;h=34a961d3af02319e3707e1f69… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Dec 15 17:27:53 2009 +0000 dbghelp: Fix compilation on OSX. --- dlls/dbghelp/macho_module.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index 4210d1f..4cc220e 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -777,7 +777,7 @@ static void macho_finish_stabs(struct module* module, struct hash_table* ht_symt sym = symt_find_nearest(module, ste->addr); if (sym) - symt_get_info(&sym->symt, TI_GET_ADDRESS, &addr); + symt_get_info(module, &sym->symt, TI_GET_ADDRESS, &addr); if (sym && ste->addr == addr) { ULONG64 size = 0; @@ -791,8 +791,8 @@ static void macho_finish_stabs(struct module* module, struct hash_table* ht_symt * Also, we check that we don't have two symbols, one local, the other * global, which is legal. */ - symt_get_info(&sym->symt, TI_GET_LENGTH, &size); - symt_get_info(&sym->symt, TI_GET_DATAKIND, &kind); + symt_get_info(module, &sym->symt, TI_GET_LENGTH, &size); + symt_get_info(module, &sym->symt, TI_GET_DATAKIND, &kind); if (size && kind == (ste->is_global ? DataIsGlobal : DataIsFileStatic)) FIXME("Duplicate in %s: %s<%08lx> %s<%s-%s>\n", debugstr_w(module->module.ModuleName),

1 0

Nicolas Le Cam : winedbg: Fix Norwegian translation warning by adding UTF-8 pragma.
by Alexandre Julliard 16 Dec '09

16 Dec '09

Module: wine Branch: master Commit: 7692d926e867594d7fd6ebf82a081808ec14e641 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7692d926e867594d7fd6ebf82… Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Tue Dec 15 18:52:48 2009 +0100 winedbg: Fix Norwegian translation warning by adding UTF-8 pragma. --- programs/winedbg/rsrc_No.rc | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/programs/winedbg/rsrc_No.rc b/programs/winedbg/rsrc_No.rc index 795aec3..2826801 100644 --- a/programs/winedbg/rsrc_No.rc +++ b/programs/winedbg/rsrc_No.rc @@ -20,6 +20,9 @@ #include "resource.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL IDM_DEBUG_POPUP MENU

1 0

Amine Khaldi : crypt32: Remove unneeded assignments.
by Alexandre Julliard 16 Dec '09

16 Dec '09

Module: wine Branch: master Commit: 483d2415599e0c0c039caed270a17fb68dcfe222 URL: http://source.winehq.org/git/wine.git/?a=commit;h=483d2415599e0c0c039caed27… Author: Amine Khaldi <amine48rz(a)gmail.com> Date: Tue Dec 15 17:23:10 2009 +0100 crypt32: Remove unneeded assignments. --- dlls/crypt32/cert.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index a247570..c25e612 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -2854,7 +2854,7 @@ static void CertContext_SetKeyProvInfo(PCCERT_CONTEXT context, { info.pwszContainerName = CryptMemAlloc(len * sizeof(WCHAR)); - len = MultiByteToWideChar(CP_ACP, 0, szContainer, -1, + MultiByteToWideChar(CP_ACP, 0, szContainer, -1, info.pwszContainerName, len); } } @@ -2878,7 +2878,7 @@ static void CertContext_SetKeyProvInfo(PCCERT_CONTEXT context, { info.pwszProvName = CryptMemAlloc(len * sizeof(WCHAR)); - len = MultiByteToWideChar(CP_ACP, 0, szProvider, -1, + MultiByteToWideChar(CP_ACP, 0, szProvider, -1, info.pwszProvName, len); } } @@ -2898,7 +2898,7 @@ static void CertContext_SetKeyProvInfo(PCCERT_CONTEXT context, pInfo = &info; } - ret = CertSetCertificateContextProperty(context, CERT_KEY_PROV_INFO_PROP_ID, + CertSetCertificateContextProperty(context, CERT_KEY_PROV_INFO_PROP_ID, 0, pInfo); if (pInfo == &info)

1 0