September 2010 - Wine-commits

Juan Lang : wininet: Store WININET_NETCONNECTION * in SSL context.
by Alexandre Julliard 30 Sep '10

30 Sep '10

Module: wine Branch: master Commit: ce0164c3f784e1768b74296b7a19c92d030a8723 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce0164c3f784e1768b74296b7… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Sep 28 16:33:19 2010 -0700 wininet: Store WININET_NETCONNECTION * in SSL context. --- dlls/wininet/netconnection.c | 25 ++++++++++++++++++++++++- 1 files changed, 24 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 6edc9ea..9717b92 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -122,6 +122,7 @@ static SSL_METHOD *meth; static SSL_CTX *ctx; static int hostname_idx; static int error_idx; +static int conn_idx; #define MAKE_FUNCPTR(f) static typeof(f) * p##f @@ -459,6 +460,15 @@ DWORD NETCON_init(WININET_NETCONNECTION *connection, BOOL useSSL) LeaveCriticalSection(&init_ssl_cs); return ERROR_OUTOFMEMORY; } + conn_idx = pSSL_get_ex_new_index(0, (void *)"netconn index", + NULL, NULL, NULL); + if (conn_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); @@ -670,7 +680,20 @@ DWORD NETCON_secure_connect(WININET_NETCONNECTION *connection, LPWSTR hostname) ERR("SSL_connect failed: %d\n", res); goto fail; } - pSSL_set_ex_data(connection->ssl_s, hostname_idx, hostname); + if (!pSSL_set_ex_data(connection->ssl_s, hostname_idx, hostname)) + { + ERR("SSL_set_ex_data failed: %s\n", + pERR_error_string(pERR_get_error(), 0)); + res = ERROR_INTERNET_SECURITY_CHANNEL_ERROR; + goto fail; + } + if (!pSSL_set_ex_data(connection->ssl_s, conn_idx, connection)) + { + ERR("SSL_set_ex_data failed: %s\n", + pERR_error_string(pERR_get_error(), 0)); + res = ERROR_INTERNET_SECURITY_CHANNEL_ERROR; + goto fail; + } cert = pSSL_get_peer_certificate(connection->ssl_s); if (!cert) {

1 0

Juan Lang : wininet: Store security flags in WININET_NETCONNECTION.
by Alexandre Julliard 30 Sep '10

30 Sep '10

Module: wine Branch: master Commit: 77c4ade08bbd6a76d59c2c6e45a4585470909539 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77c4ade08bbd6a76d59c2c6e4… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Sep 28 16:46:41 2010 -0700 wininet: Store security flags in WININET_NETCONNECTION. --- dlls/wininet/http.c | 11 +++++++++++ dlls/wininet/internet.h | 1 + 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index f5ae426..5c278d3 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1887,6 +1887,17 @@ static DWORD HTTPREQ_SetOption(object_header_t *hdr, DWORD option, void *buffer, http_request_t *req = (http_request_t*)hdr; switch(option) { + case INTERNET_OPTION_SECURITY_FLAGS: + { + DWORD flags; + + if (!buffer || size != sizeof(DWORD)) + return ERROR_INVALID_PARAMETER; + flags = *(DWORD *)buffer; + TRACE("%08x\n", flags); + req->netConnection.security_flags = flags; + return ERROR_SUCCESS; + } case INTERNET_OPTION_SEND_TIMEOUT: case INTERNET_OPTION_RECEIVE_TIMEOUT: TRACE("INTERNET_OPTION_SEND/RECEIVE_TIMEOUT\n"); diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 40de22f..109179f 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -53,6 +53,7 @@ typedef struct BOOL useSSL; int socketFD; void *ssl_s; + DWORD security_flags; } WININET_NETCONNECTION; static inline LPWSTR heap_strdupW(LPCWSTR str)

1 0

Juan Lang : wininet: Don't retrieve a certificate that isn't used.
by Alexandre Julliard 30 Sep '10

30 Sep '10

Module: wine Branch: master Commit: 181a367a1f77ae3b88e0e36dcad7b0840b920de6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=181a367a1f77ae3b88e0e36dc… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Sep 28 18:10:40 2010 -0700 wininet: Don't retrieve a certificate that isn't used. --- dlls/wininet/netconnection.c | 9 --------- 1 files changed, 0 insertions(+), 9 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 9717b92..d6bd567 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -646,7 +646,6 @@ DWORD NETCON_secure_connect(WININET_NETCONNECTION *connection, LPWSTR hostname) DWORD res = ERROR_NOT_SUPPORTED; #ifdef SONAME_LIBSSL long verify_res; - X509 *cert; /* can't connect if we are already connected */ if (connection->useSSL) @@ -694,14 +693,6 @@ DWORD NETCON_secure_connect(WININET_NETCONNECTION *connection, LPWSTR hostname) res = ERROR_INTERNET_SECURITY_CHANNEL_ERROR; goto fail; } - cert = pSSL_get_peer_certificate(connection->ssl_s); - if (!cert) - { - ERR("no certificate for server %s\n", debugstr_w(hostname)); - /* FIXME: is this the best error? */ - res = ERROR_INTERNET_INVALID_CA; - goto fail; - } verify_res = pSSL_get_verify_result(connection->ssl_s); if (verify_res != X509_V_OK) {

1 0

Juan Lang : wininet: Don' t call SSL_connect until initialization is complete.
by Alexandre Julliard 30 Sep '10

30 Sep '10

Module: wine Branch: master Commit: 98dbdadcdafaa3708e36074708ade5782f892fe4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98dbdadcdafaa3708e3607470… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Sep 28 18:15:58 2010 -0700 wininet: Don't call SSL_connect until initialization is complete. --- dlls/wininet/netconnection.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index d6bd567..9d52ae6 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -671,14 +671,6 @@ DWORD NETCON_secure_connect(WININET_NETCONNECTION *connection, LPWSTR hostname) goto fail; } - if (pSSL_connect(connection->ssl_s) <= 0) - { - res = (DWORD_PTR)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; - } if (!pSSL_set_ex_data(connection->ssl_s, hostname_idx, hostname)) { ERR("SSL_set_ex_data failed: %s\n", @@ -693,6 +685,14 @@ DWORD NETCON_secure_connect(WININET_NETCONNECTION *connection, LPWSTR hostname) res = ERROR_INTERNET_SECURITY_CHANNEL_ERROR; goto fail; } + if (pSSL_connect(connection->ssl_s) <= 0) + { + res = (DWORD_PTR)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; + } verify_res = pSSL_get_verify_result(connection->ssl_s); if (verify_res != X509_V_OK) {

1 0

Juan Lang : wininet: Honor security flags when verifying certificates.
by Alexandre Julliard 30 Sep '10

30 Sep '10

Module: wine Branch: master Commit: 44112c367f6a08a7dd0d841b34d0ead3d6bcac63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44112c367f6a08a7dd0d841b3… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Sep 29 07:53:53 2010 -0700 wininet: Honor security flags when verifying certificates. --- dlls/wininet/netconnection.c | 52 +++++++++++++++++++++++++++++++---------- 1 files changed, 39 insertions(+), 13 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 9d52ae6..7bb00dc 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -220,7 +220,7 @@ static PCCERT_CONTEXT X509_to_cert_context(X509 *cert) } static DWORD netconn_verify_cert(PCCERT_CONTEXT cert, HCERTSTORE store, - WCHAR *server) + WCHAR *server, DWORD security_flags) { BOOL ret; CERT_CHAIN_PARA chainPara = { sizeof(chainPara), { 0 } }; @@ -237,30 +237,49 @@ static DWORD netconn_verify_cert(PCCERT_CONTEXT cert, HCERTSTORE store, { if (chain->TrustStatus.dwErrorStatus) { + static const DWORD supportedErrors = + CERT_TRUST_IS_NOT_TIME_VALID | + CERT_TRUST_IS_UNTRUSTED_ROOT | + CERT_TRUST_IS_OFFLINE_REVOCATION | + CERT_TRUST_REVOCATION_STATUS_UNKNOWN | + CERT_TRUST_IS_REVOKED | + CERT_TRUST_IS_NOT_VALID_FOR_USAGE; + if (chain->TrustStatus.dwErrorStatus & CERT_TRUST_IS_NOT_TIME_VALID) err = ERROR_INTERNET_SEC_CERT_DATE_INVALID; else if (chain->TrustStatus.dwErrorStatus & - CERT_TRUST_IS_UNTRUSTED_ROOT) + CERT_TRUST_IS_UNTRUSTED_ROOT && + !(security_flags & SECURITY_FLAG_IGNORE_UNKNOWN_CA)) err = ERROR_INTERNET_INVALID_CA; - else if ((chain->TrustStatus.dwErrorStatus & + else if (!(security_flags & SECURITY_FLAG_IGNORE_REVOCATION) && + ((chain->TrustStatus.dwErrorStatus & CERT_TRUST_IS_OFFLINE_REVOCATION) || - (chain->TrustStatus.dwErrorStatus & - CERT_TRUST_REVOCATION_STATUS_UNKNOWN)) + (chain->TrustStatus.dwErrorStatus & + CERT_TRUST_REVOCATION_STATUS_UNKNOWN))) err = ERROR_INTERNET_SEC_CERT_NO_REV; - else if (chain->TrustStatus.dwErrorStatus & CERT_TRUST_IS_REVOKED) + else if (!(security_flags & SECURITY_FLAG_IGNORE_REVOCATION) && + (chain->TrustStatus.dwErrorStatus & CERT_TRUST_IS_REVOKED)) err = ERROR_INTERNET_SEC_CERT_REVOKED; - else if (chain->TrustStatus.dwErrorStatus & - CERT_TRUST_IS_NOT_VALID_FOR_USAGE) + else if (!(security_flags & SECURITY_FLAG_IGNORE_WRONG_USAGE) && + (chain->TrustStatus.dwErrorStatus & + CERT_TRUST_IS_NOT_VALID_FOR_USAGE)) err = ERROR_INTERNET_SEC_INVALID_CERT; - else + else if (chain->TrustStatus.dwErrorStatus & ~supportedErrors) err = ERROR_INTERNET_SEC_INVALID_CERT; } - else + if (!err) { CERT_CHAIN_POLICY_PARA policyPara; SSL_EXTRA_CERT_CHAIN_POLICY_PARA sslExtraPolicyPara; CERT_CHAIN_POLICY_STATUS policyStatus; + CERT_CHAIN_CONTEXT chainCopy; + /* Clear chain->TrustStatus.dwErrorStatus so + * CertVerifyCertificateChainPolicy will verify additional checks + * rather than stopping with an existing, ignored error. + */ + memcpy(&chainCopy, chain, sizeof(chainCopy)); + chainCopy.TrustStatus.dwErrorStatus = 0; sslExtraPolicyPara.u.cbSize = sizeof(sslExtraPolicyPara); sslExtraPolicyPara.dwAuthType = AUTHTYPE_SERVER; sslExtraPolicyPara.pwszServerName = server; @@ -268,14 +287,18 @@ static DWORD netconn_verify_cert(PCCERT_CONTEXT cert, HCERTSTORE store, policyPara.dwFlags = 0; policyPara.pvExtraPolicyPara = &sslExtraPolicyPara; ret = CertVerifyCertificateChainPolicy(CERT_CHAIN_POLICY_SSL, - chain, &policyPara, &policyStatus); + &chainCopy, &policyPara, &policyStatus); /* Any error in the policy status indicates that the * policy couldn't be verified. */ if (ret && policyStatus.dwError) { if (policyStatus.dwError == CERT_E_CN_NO_MATCH) - err = ERROR_INTERNET_SEC_CERT_CN_INVALID; + { + if (!(security_flags & + SECURITY_FLAG_IGNORE_CERT_CN_INVALID)) + err = ERROR_INTERNET_SEC_CERT_CN_INVALID; + } else err = ERROR_INTERNET_SEC_INVALID_CERT; } @@ -293,10 +316,12 @@ static int netconn_secure_verify(int preverify_ok, X509_STORE_CTX *ctx) BOOL ret = FALSE; HCERTSTORE store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, CERT_STORE_CREATE_NEW_FLAG, NULL); + WININET_NETCONNECTION *conn; ssl = pX509_STORE_CTX_get_ex_data(ctx, pSSL_get_ex_data_X509_STORE_CTX_idx()); server = pSSL_get_ex_data(ssl, hostname_idx); + conn = pSSL_get_ex_data(ssl, conn_idx); if (store) { X509 *cert; @@ -323,7 +348,8 @@ static int netconn_secure_verify(int preverify_ok, X509_STORE_CTX *ctx) if (!endCert) ret = FALSE; if (ret) { - DWORD_PTR err = netconn_verify_cert(endCert, store, server); + DWORD_PTR err = netconn_verify_cert(endCert, store, server, + conn->security_flags); if (err) {

1 0

Juan Lang : wininet: Remove unneeded error message.
by Alexandre Julliard 30 Sep '10

30 Sep '10

Module: wine Branch: master Commit: 6808c1c684677a4664a9dd18d33235032965fde8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6808c1c684677a4664a9dd18d… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Sep 29 08:16:07 2010 -0700 wininet: Remove unneeded error message. --- dlls/wininet/netconnection.c | 12 +----------- 1 files changed, 1 insertions(+), 11 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 7bb00dc..e06a253 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -145,7 +145,6 @@ MAKE_FUNCPTR(SSL_get_ex_new_index); MAKE_FUNCPTR(SSL_get_ex_data); MAKE_FUNCPTR(SSL_set_ex_data); MAKE_FUNCPTR(SSL_get_ex_data_X509_STORE_CTX_idx); -MAKE_FUNCPTR(SSL_get_verify_result); MAKE_FUNCPTR(SSL_get_peer_certificate); MAKE_FUNCPTR(SSL_CTX_get_timeout); MAKE_FUNCPTR(SSL_CTX_set_timeout); @@ -426,7 +425,6 @@ DWORD NETCON_init(WININET_NETCONNECTION *connection, BOOL useSSL) DYNSSL(SSL_get_ex_data); DYNSSL(SSL_set_ex_data); DYNSSL(SSL_get_ex_data_X509_STORE_CTX_idx); - DYNSSL(SSL_get_verify_result); DYNSSL(SSL_get_peer_certificate); DYNSSL(SSL_CTX_get_timeout); DYNSSL(SSL_CTX_set_timeout); @@ -670,9 +668,8 @@ DWORD NETCON_close(WININET_NETCONNECTION *connection) DWORD NETCON_secure_connect(WININET_NETCONNECTION *connection, LPWSTR hostname) { DWORD res = ERROR_NOT_SUPPORTED; -#ifdef SONAME_LIBSSL - long verify_res; +#ifdef SONAME_LIBSSL /* can't connect if we are already connected */ if (connection->useSSL) { @@ -719,13 +716,6 @@ DWORD NETCON_secure_connect(WININET_NETCONNECTION *connection, LPWSTR hostname) ERR("SSL_connect failed: %d\n", res); goto fail; } - verify_res = pSSL_get_verify_result(connection->ssl_s); - if (verify_res != X509_V_OK) - { - ERR("couldn't verify the security of the connection, %ld\n", verify_res); - /* FIXME: we should set an error and return, but we only warn at - * the moment */ - } connection->useSSL = TRUE; return ERROR_SUCCESS;

1 0

Juan Lang : wininet: More completely implement querying INTERNET_OPTION_SECURITY_FLAGS.
by Alexandre Julliard 30 Sep '10

30 Sep '10

Module: wine Branch: master Commit: 0e4e2a378abeee691c710d38920dcbac1f9dec9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e4e2a378abeee691c710d389… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Sep 29 09:13:41 2010 -0700 wininet: More completely implement querying INTERNET_OPTION_SECURITY_FLAGS. --- dlls/wininet/http.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 5c278d3..2266fcd 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1701,7 +1701,8 @@ static DWORD HTTPREQ_QueryOption(object_header_t *hdr, DWORD option, void *buffe *(DWORD*)buffer = SECURITY_FLAG_SECURE; else *(DWORD*)buffer = 0; - FIXME("Semi-STUB INTERNET_OPTION_SECURITY_FLAGS: %x\n",*(DWORD*)buffer); + *(DWORD *)buffer |= req->netConnection.security_flags; + /* FIXME: set connection cipher strength (SECURITY_FLAG_STRENGTH_*) */ return ERROR_SUCCESS; }

1 0

Jeremy Newman : update the RSVP page for 2010
by Jeremy Newman 29 Sep '10

29 Sep '10

Module: website Branch: master Commit: 7c4a2f22891b2880afd66b01731babc87ed2852b URL: http://source.winehq.org/git/website.git/?a=commit;h=7c4a2f22891b2880afd66b… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Wed Sep 29 16:26:06 2010 -0500 update the RSVP page for 2010 --- templates/en/wineconf/rsvp.template | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/templates/en/wineconf/rsvp.template b/templates/en/wineconf/rsvp.template index 5d2fa83..df4999d 100644 --- a/templates/en/wineconf/rsvp.template +++ b/templates/en/wineconf/rsvp.template @@ -3,7 +3,7 @@ <table width="100%"> <tr> <td><img src="{$root}/images/wineconf/wineconf_logo.jpg" width="295" height="108" alt="-LOGO-"></td> - <td align="right"><center>September 16 - 17, 2006 Reading, UK</center></td> + <td align="right"><center>November 20 - 21, 2010 Paris, France</center></td> </tr> </table>

1 0

André Hentschel : German link to Launchpad PPA
by Jeremy Newman 29 Sep '10

29 Sep '10

Module: website Branch: master Commit: 6f2fbd8a848e3414a818301a491e08dba8eb956a URL: http://source.winehq.org/git/website.git/?a=commit;h=6f2fbd8a848e3414a81830… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Sep 29 18:45:36 2010 +0200 German link to Launchpad PPA --- templates/de/download/deb.template | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/templates/de/download/deb.template b/templates/de/download/deb.template index 13ff76c..19cb94f 100644 --- a/templates/de/download/deb.template +++ b/templates/de/download/deb.template @@ -57,3 +57,5 @@ Derivate. Zuerst öffne ein Terminalfenster (Anwendungen->Zubehör->Term Aktualisiere dann die APT-Paketinformationen durch Ausführen von 'sudo apt-get update'. Du kannst nun Wine durch Ausführen von 'sudo apt-get install wine1.3' im Terminal installieren. + +Wenn du das PPA durchsuchen willst, kannst du es <a href="https://launchpad.net/~ubuntu-wine/+archive/ppa">bei Launchpad anschauen</a>.

1 0

Jacek Caban : mshtml: Get rid of use_wine_url.
by Alexandre Julliard 29 Sep '10

29 Sep '10

Module: wine Branch: master Commit: d98bb11f49b69ad3de14d334ed532d357bd6c9f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d98bb11f49b69ad3de14d334e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 29 12:45:13 2010 +0200 mshtml: Get rid of use_wine_url. --- dlls/mshtml/nsio.c | 64 +++++++++------------------------------------------ 1 files changed, 12 insertions(+), 52 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 52a52ff..9ac735c 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -66,7 +66,6 @@ struct nsWineURI { LPWSTR wine_url; IUri *uri; BOOL is_doc_uri; - BOOL use_wine_url; }; #define NSURI(x) ((nsIURI*) &(x)->lpIURLVtbl) @@ -246,10 +245,6 @@ nsresult on_start_uri_open(NSContainer *nscontainer, nsIURI *uri, PRBool *_retva HRESULT set_wine_url(nsWineURI *This, LPCWSTR url) { - static const WCHAR wszFtp[] = {'f','t','p',':'}; - static const WCHAR wszHttp[] = {'h','t','t','p',':'}; - static const WCHAR wszHttps[] = {'h','t','t','p','s',':'}; - TRACE("(%p)->(%s)\n", This, debugstr_w(url)); if(url) { @@ -260,20 +255,9 @@ HRESULT set_wine_url(nsWineURI *This, LPCWSTR url) return E_OUTOFMEMORY; heap_free(This->wine_url); This->wine_url = new_url; - - if(This->nsuri) { - /* FIXME: Always use wine url */ - This->use_wine_url = - strncmpW(url, wszFtp, sizeof(wszFtp)/sizeof(WCHAR)) - && strncmpW(url, wszHttp, sizeof(wszHttp)/sizeof(WCHAR)) - && strncmpW(url, wszHttps, sizeof(wszHttps)/sizeof(WCHAR)); - }else { - This->use_wine_url = TRUE; - } }else { heap_free(This->wine_url); This->wine_url = NULL; - This->use_wine_url = FALSE; } return S_OK; @@ -1657,23 +1641,13 @@ static nsrefcnt NSAPI nsURI_Release(nsIURL *iface) static nsresult NSAPI nsURI_GetSpec(nsIURL *iface, nsACString *aSpec) { nsWineURI *This = NSURI_THIS(iface); + char speca[INTERNET_MAX_URL_LENGTH]; TRACE("(%p)->(%p)\n", This, aSpec); - if(This->use_wine_url) { - char speca[INTERNET_MAX_URL_LENGTH]; - WideCharToMultiByte(CP_ACP, 0, This->wine_url, -1, speca, sizeof(speca), NULL, NULL); - nsACString_SetData(aSpec, speca); - - return NS_OK; - } - - if(This->nsuri) - return nsIURI_GetSpec(This->nsuri, aSpec); - - TRACE("returning error\n"); - return NS_ERROR_NOT_IMPLEMENTED; - + WideCharToMultiByte(CP_ACP, 0, This->wine_url, -1, speca, sizeof(speca), NULL, NULL); + nsACString_SetData(aSpec, speca); + return NS_OK; } static nsresult NSAPI nsURI_SetSpec(nsIURL *iface, const nsACString *aSpec) @@ -2016,24 +1990,17 @@ static nsresult NSAPI nsURI_Equals(nsIURL *iface, nsIURI *other, PRBool *_retval static nsresult NSAPI nsURI_SchemeIs(nsIURL *iface, const char *scheme, PRBool *_retval) { nsWineURI *This = NSURI_THIS(iface); + WCHAR buf[INTERNET_MAX_SCHEME_LENGTH]; + int len; TRACE("(%p)->(%s %p)\n", This, debugstr_a(scheme), _retval); - if(This->use_wine_url) { - WCHAR buf[INTERNET_MAX_SCHEME_LENGTH]; - int len = MultiByteToWideChar(CP_ACP, 0, scheme, -1, buf, sizeof(buf)/sizeof(WCHAR))-1; - - *_retval = lstrlenW(This->wine_url) > len - && This->wine_url[len] == ':' - && !memcmp(buf, This->wine_url, len*sizeof(WCHAR)); - return NS_OK; - } - - if(This->nsuri) - return nsIURI_SchemeIs(This->nsuri, scheme, _retval); + len = MultiByteToWideChar(CP_ACP, 0, scheme, -1, buf, sizeof(buf)/sizeof(WCHAR))-1; - TRACE("returning error\n"); - return NS_ERROR_NOT_IMPLEMENTED; + *_retval = lstrlenW(This->wine_url) > len + && This->wine_url[len] == ':' + && !memcmp(buf, This->wine_url, len*sizeof(WCHAR)); + return NS_OK; } static nsresult NSAPI nsURI_Clone(nsIURL *iface, nsIURI **_retval) @@ -2116,14 +2083,7 @@ static nsresult NSAPI nsURI_GetAsciiSpec(nsIURL *iface, nsACString *aAsciiSpec) TRACE("(%p)->(%p)\n", This, aAsciiSpec); - if(This->use_wine_url) - return nsIURI_GetSpec(NSURI(This), aAsciiSpec); - - if(This->nsuri) - return nsIURI_GetAsciiSpec(This->nsuri, aAsciiSpec); - - TRACE("returning error\n"); - return NS_ERROR_NOT_IMPLEMENTED; + return nsIURI_GetSpec(NSURI(This), aAsciiSpec); } static nsresult NSAPI nsURI_GetAsciiHost(nsIURL *iface, nsACString *aAsciiHost)

1 0