August 2008 - Wine-commits - list.winehq.org

Rob Shearman : rpcrt4: Add tests for RpcBindingReset.
by Alexandre Julliard 27 Aug '08

27 Aug '08

Module: wine Branch: master Commit: bce9cd38b0c27486d3fa6f9174f5a01359e85b53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bce9cd38b0c27486d3fa6f917… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Aug 26 20:05:25 2008 +0100 rpcrt4: Add tests for RpcBindingReset. --- dlls/rpcrt4/tests/rpc.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/tests/rpc.c b/dlls/rpcrt4/tests/rpc.c index c59d7d6..bcd6a65 100644 --- a/dlls/rpcrt4/tests/rpc.c +++ b/dlls/rpcrt4/tests/rpc.c @@ -704,9 +704,17 @@ static void test_endpoint_mapper(RPC_CSTR protseq, RPC_CSTR address, RpcStringFree(&binding); + status = RpcBindingReset(handle); + ok(status == RPC_S_OK, "%s: RpcBindingReset failed with error %lu\n", protseq, status); + + RpcStringFree(&binding); + status = RpcEpResolveBinding(handle, IFoo_v0_0_s_ifspec); ok(status == RPC_S_OK, "%s: RpcEpResolveBinding failed with error %lu\n", protseq, status); + status = RpcBindingReset(handle); + ok(status == RPC_S_OK, "%s: RpcBindingReset failed with error %lu\n", protseq, status); + status = RpcBindingFree(&handle); ok(status == RPC_S_OK, "%s: RpcBindingFree failed with error %lu\n", protseq, status);

1 0

Paul Vriens : comctl32/tests: Don't assert on not implemented function.
by Alexandre Julliard 27 Aug '08

27 Aug '08

Module: wine Branch: master Commit: 2d18e5aac43885daf9ffc576eeedbae4bc63fb64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d18e5aac43885daf9ffc576e… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Tue Aug 26 17:30:09 2008 +0200 comctl32/tests: Don't assert on not implemented function. --- dlls/comctl32/tests/tooltips.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/tooltips.c b/dlls/comctl32/tests/tooltips.c index c945a27..6bf5a3a 100644 --- a/dlls/comctl32/tests/tooltips.c +++ b/dlls/comctl32/tests/tooltips.c @@ -266,9 +266,16 @@ static void test_gettext(void) DestroyWindow(hwnd); + SetLastError(0xdeadbeef); hwnd = CreateWindowExW(0, TOOLTIPS_CLASSW, NULL, 0, 10, 10, 300, 100, NULL, NULL, NULL, 0); + + if (!hwnd && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) { + win_skip("CreateWindowExW is not implemented\n"); + return; + } + assert(hwnd); toolinfoW.cbSize = sizeof(TTTOOLINFOW);

1 0

Paul Vriens : shlwapi/tests: Fix a test on Vista.
by Alexandre Julliard 27 Aug '08

27 Aug '08

Module: wine Branch: master Commit: 0bafb787557ab4b38fbb697f1987bdbd8ac456da URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bafb787557ab4b38fbb697f1… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Tue Aug 26 15:52:35 2008 +0200 shlwapi/tests: Fix a test on Vista. --- dlls/shlwapi/tests/path.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/tests/path.c b/dlls/shlwapi/tests/path.c index 07257d7..d84ca7a 100644 --- a/dlls/shlwapi/tests/path.c +++ b/dlls/shlwapi/tests/path.c @@ -913,7 +913,8 @@ static void test_PathCanonicalizeA(void) ok(!res, "Expected failure\n"); todo_wine { - ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError()); + ok(GetLastError() == 0xdeadbeef || GetLastError() == ERROR_FILENAME_EXCED_RANGE /* Vista */, + "Expected 0xdeadbeef or ERROR_FILENAME_EXCED_RANGE, got %d\n", GetLastError()); } ok(lstrlen(too_long) == LONG_LEN - 1, "Expected length LONG_LEN - 1, got %i\n", lstrlen(too_long)); }

1 0

Hans Leidekker : winhttp: Implement WinHttpQueryAuthSchemes.
by Alexandre Julliard 27 Aug '08

27 Aug '08

Module: wine Branch: master Commit: 3f85f4552bf9ed54aa80fe61191083bab8c2598b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f85f4552bf9ed54aa80fe611… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Aug 26 16:56:54 2008 +0200 winhttp: Implement WinHttpQueryAuthSchemes. --- dlls/winhttp/request.c | 96 +++++++++++++++++++++++++++++++++++++++++++++ dlls/winhttp/winhttp.spec | 2 +- 2 files changed, 97 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index ef1582d..392b7d0 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1136,3 +1136,99 @@ BOOL WINAPI WinHttpWriteData( HINTERNET hrequest, LPCVOID buffer, DWORD to_write release_object( &request->hdr ); return ret; } + +#define ARRAYSIZE(array) (sizeof(array) / sizeof((array)[0])) + +static DWORD auth_scheme_from_header( WCHAR *header ) +{ + static const WCHAR basic[] = {'B','a','s','i','c'}; + static const WCHAR ntlm[] = {'N','T','L','M'}; + static const WCHAR passport[] = {'P','a','s','s','p','o','r','t'}; + static const WCHAR digest[] = {'D','i','g','e','s','t'}; + static const WCHAR negotiate[] = {'N','e','g','o','t','i','a','t','e'}; + + if (!strncmpiW( header, basic, ARRAYSIZE(basic) ) && + (header[ARRAYSIZE(basic)] == ' ' || !header[ARRAYSIZE(basic)])) return WINHTTP_AUTH_SCHEME_BASIC; + + if (!strncmpiW( header, ntlm, ARRAYSIZE(ntlm) ) && + (header[ARRAYSIZE(ntlm)] == ' ' || !header[ARRAYSIZE(ntlm)])) return WINHTTP_AUTH_SCHEME_NTLM; + + if (!strncmpiW( header, passport, ARRAYSIZE(passport) ) && + (header[ARRAYSIZE(passport)] == ' ' || !header[ARRAYSIZE(passport)])) return WINHTTP_AUTH_SCHEME_PASSPORT; + + if (!strncmpiW( header, digest, ARRAYSIZE(digest) ) && + (header[ARRAYSIZE(digest)] == ' ' || !header[ARRAYSIZE(digest)])) return WINHTTP_AUTH_SCHEME_DIGEST; + + if (!strncmpiW( header, negotiate, ARRAYSIZE(negotiate) ) && + (header[ARRAYSIZE(negotiate)] == ' ' || !header[ARRAYSIZE(negotiate)])) return WINHTTP_AUTH_SCHEME_NEGOTIATE; + + return 0; +} + +static BOOL query_auth_schemes( request_t *request, DWORD level, LPDWORD supported, LPDWORD first ) +{ + DWORD index = 0; + BOOL ret = FALSE; + + for (;;) + { + WCHAR *buffer; + DWORD size, scheme; + + size = 0; + query_headers( request, level, NULL, NULL, &size, &index ); + if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) break; + + index--; + if (!(buffer = heap_alloc( size ))) return FALSE; + if (!query_headers( request, level, NULL, buffer, &size, &index )) + { + heap_free( buffer ); + return FALSE; + } + scheme = auth_scheme_from_header( buffer ); + if (index == 1) *first = scheme; + *supported |= scheme; + + heap_free( buffer ); + ret = TRUE; + } + return ret; +} + +/*********************************************************************** + * WinHttpQueryAuthSchemes (winhttp.@) + */ +BOOL WINAPI WinHttpQueryAuthSchemes( HINTERNET hrequest, LPDWORD supported, LPDWORD first, LPDWORD target ) +{ + BOOL ret = FALSE; + request_t *request; + + TRACE("%p, %p, %p, %p\n", hrequest, supported, first, target); + + if (!(request = (request_t *)grab_object( hrequest ))) + { + set_last_error( ERROR_INVALID_HANDLE ); + return FALSE; + } + if (request->hdr.type != WINHTTP_HANDLE_TYPE_REQUEST) + { + release_object( &request->hdr ); + set_last_error( ERROR_WINHTTP_INCORRECT_HANDLE_TYPE ); + return FALSE; + } + + if (query_auth_schemes( request, WINHTTP_QUERY_WWW_AUTHENTICATE, supported, first )) + { + *target = WINHTTP_AUTH_TARGET_SERVER; + ret = TRUE; + } + else if (query_auth_schemes( request, WINHTTP_QUERY_PROXY_AUTHENTICATE, supported, first )) + { + *target = WINHTTP_AUTH_TARGET_PROXY; + ret = TRUE; + } + + release_object( &request->hdr ); + return ret; +} diff --git a/dlls/winhttp/winhttp.spec b/dlls/winhttp/winhttp.spec index 4144364..7416754 100644 --- a/dlls/winhttp/winhttp.spec +++ b/dlls/winhttp/winhttp.spec @@ -14,7 +14,7 @@ @ stdcall WinHttpGetProxyForUrl(ptr wstr ptr ptr) @ stdcall WinHttpOpen(wstr long wstr wstr long) @ stdcall WinHttpOpenRequest(ptr wstr wstr wstr wstr ptr long) -@ stub WinHttpQueryAuthSchemes +@ stdcall WinHttpQueryAuthSchemes(ptr ptr ptr ptr) @ stdcall WinHttpQueryDataAvailable(ptr ptr) @ stdcall WinHttpQueryHeaders(ptr long wstr ptr ptr ptr) @ stdcall WinHttpQueryOption(ptr long ptr ptr)

1 0

Hans Leidekker : winhttp: Implement WinHttpSetCredentials.
by Alexandre Julliard 27 Aug '08

27 Aug '08

Module: wine Branch: master Commit: 70c6a8ac62ecaf95a5c62ef154fef536b42715b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70c6a8ac62ecaf95a5c62ef15… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Aug 26 16:59:38 2008 +0200 winhttp: Implement WinHttpSetCredentials. Only supports the basic authentication scheme. --- dlls/winhttp/request.c | 133 +++++++++++++++++++++++++++++++++++++++++++++ dlls/winhttp/winhttp.spec | 2 +- 2 files changed, 134 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 392b7d0..6b4263a 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1232,3 +1232,136 @@ BOOL WINAPI WinHttpQueryAuthSchemes( HINTERNET hrequest, LPDWORD supported, LPDW release_object( &request->hdr ); return ret; } + +static UINT encode_base64( const char *bin, unsigned int len, WCHAR *base64 ) +{ + UINT n = 0, x; + static const char base64enc[] = + "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; + + while (len > 0) + { + /* first 6 bits, all from bin[0] */ + base64[n++] = base64enc[(bin[0] & 0xfc) >> 2]; + x = (bin[0] & 3) << 4; + + /* next 6 bits, 2 from bin[0] and 4 from bin[1] */ + if (len == 1) + { + base64[n++] = base64enc[x]; + base64[n++] = '='; + base64[n++] = '='; + break; + } + base64[n++] = base64enc[x | ((bin[1] & 0xf0) >> 4)]; + x = (bin[1] & 0x0f) << 2; + + /* next 6 bits 4 from bin[1] and 2 from bin[2] */ + if (len == 2) + { + base64[n++] = base64enc[x]; + base64[n++] = '='; + break; + } + base64[n++] = base64enc[x | ((bin[2] & 0xc0) >> 6)]; + + /* last 6 bits, all from bin [2] */ + base64[n++] = base64enc[bin[2] & 0x3f]; + bin += 3; + len -= 3; + } + base64[n] = 0; + return n; +} + +static BOOL set_credentials( request_t *request, DWORD target, DWORD scheme, LPCWSTR username, LPCWSTR password ) +{ + static const WCHAR basic[] = {'B','a','s','i','c',' ',0}; + + const WCHAR *auth_scheme, *auth_target; + WCHAR *auth_header; + DWORD len, auth_data_len; + char *auth_data; + BOOL ret; + + switch (target) + { + case WINHTTP_AUTH_TARGET_SERVER: auth_target = attr_authorization; break; + case WINHTTP_AUTH_TARGET_PROXY: auth_target = attr_proxy_authorization; break; + default: + WARN("unknown target %x\n", target); + return FALSE; + } + switch (scheme) + { + case WINHTTP_AUTH_SCHEME_BASIC: + { + int userlen = WideCharToMultiByte( CP_UTF8, 0, username, strlenW( username ), NULL, 0, NULL, NULL ); + int passlen = WideCharToMultiByte( CP_UTF8, 0, password, strlenW( password ), NULL, 0, NULL, NULL ); + + TRACE("basic authentication\n"); + + auth_scheme = basic; + auth_data_len = userlen + 1 + passlen; + if (!(auth_data = heap_alloc( auth_data_len ))) return FALSE; + + WideCharToMultiByte( CP_UTF8, 0, username, -1, auth_data, userlen, NULL, NULL ); + auth_data[userlen] = ':'; + WideCharToMultiByte( CP_UTF8, 0, password, -1, auth_data + userlen + 1, passlen, NULL, NULL ); + break; + } + case WINHTTP_AUTH_SCHEME_NTLM: + case WINHTTP_AUTH_SCHEME_PASSPORT: + case WINHTTP_AUTH_SCHEME_DIGEST: + case WINHTTP_AUTH_SCHEME_NEGOTIATE: + FIXME("unimplemented authentication scheme %x\n", scheme); + return FALSE; + default: + WARN("unknown authentication scheme %x\n", scheme); + return FALSE; + } + + len = strlenW( auth_scheme ) + ((auth_data_len + 2) * 4) / 3; + if (!(auth_header = heap_alloc( (len + 1) * sizeof(WCHAR) ))) + { + heap_free( auth_data ); + return FALSE; + } + strcpyW( auth_header, auth_scheme ); + encode_base64( auth_data, auth_data_len, auth_header + strlenW( auth_header ) ); + + ret = process_header( request, auth_target, auth_header, WINHTTP_ADDREQ_FLAG_ADD | WINHTTP_ADDREQ_FLAG_REPLACE, TRUE ); + + heap_free( auth_data ); + heap_free( auth_header ); + return ret; +} + +/*********************************************************************** + * WinHttpSetCredentials (winhttp.@) + */ +BOOL WINAPI WinHttpSetCredentials( HINTERNET hrequest, DWORD target, DWORD scheme, LPCWSTR username, + LPCWSTR password, LPVOID params ) +{ + BOOL ret; + request_t *request; + + TRACE("%p, %x, 0x%08x, %s, %p, %p\n", hrequest, target, scheme, debugstr_w(username), password, params); + + if (!(request = (request_t *)grab_object( hrequest ))) + { + set_last_error( ERROR_INVALID_HANDLE ); + return FALSE; + } + if (request->hdr.type != WINHTTP_HANDLE_TYPE_REQUEST) + { + release_object( &request->hdr ); + set_last_error( ERROR_WINHTTP_INCORRECT_HANDLE_TYPE ); + return FALSE; + } + + ret = set_credentials( request, target, scheme, username, password ); + + release_object( &request->hdr ); + return ret; +} diff --git a/dlls/winhttp/winhttp.spec b/dlls/winhttp/winhttp.spec index 7416754..15c560a 100644 --- a/dlls/winhttp/winhttp.spec +++ b/dlls/winhttp/winhttp.spec @@ -21,7 +21,7 @@ @ stdcall WinHttpReadData(ptr ptr long ptr) @ stdcall WinHttpReceiveResponse(ptr ptr) @ stdcall WinHttpSendRequest(ptr wstr long ptr long long ptr) -@ stub WinHttpSetCredentials +@ stdcall WinHttpSetCredentials(ptr long long wstr ptr ptr) @ stdcall WinHttpSetDefaultProxyConfiguration(ptr) @ stdcall WinHttpSetOption(ptr long ptr long) @ stdcall WinHttpSetStatusCallback(ptr ptr long ptr)

1 0

Jacek Caban : shdocvw: Pass the right IDispatch to NavigateComplete2 and DocumentComplete.
by Alexandre Julliard 27 Aug '08

27 Aug '08

Module: wine Branch: master Commit: d58666123a9c298ca18931718d64144606507db3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d58666123a9c298ca18931718… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 26 13:55:27 2008 +0200 shdocvw: Pass the right IDispatch to NavigateComplete2 and DocumentComplete. --- dlls/shdocvw/dochost.c | 10 +--------- 1 files changed, 1 insertions(+), 9 deletions(-) diff --git a/dlls/shdocvw/dochost.c b/dlls/shdocvw/dochost.c index 908503c..112c12a 100644 --- a/dlls/shdocvw/dochost.c +++ b/dlls/shdocvw/dochost.c @@ -48,15 +48,9 @@ LRESULT process_dochost_task(DocHost *This, LPARAM lparam) static void navigate_complete(DocHost *This) { - IDispatch *disp = NULL; DISPPARAMS dispparams; VARIANTARG params[2]; VARIANT url; - HRESULT hres; - - hres = IUnknown_QueryInterface(This->document, &IID_IDispatch, (void**)&disp); - if(FAILED(hres)) - FIXME("Could not get IDispatch interface\n"); dispparams.cArgs = 2; dispparams.cNamedArgs = 0; @@ -67,7 +61,7 @@ static void navigate_complete(DocHost *This) V_BYREF(params) = &url; V_VT(params+1) = VT_DISPATCH; - V_DISPATCH(params+1) = disp; + V_DISPATCH(params+1) = This->disp; V_VT(&url) = VT_BSTR; V_BSTR(&url) = SysAllocString(This->url); @@ -76,8 +70,6 @@ static void navigate_complete(DocHost *This) call_sink(This->cps.wbe2, DISPID_DOCUMENTCOMPLETE, &dispparams); SysFreeString(V_BSTR(&url)); - if(disp) - IDispatch_Release(disp); This->busy = VARIANT_FALSE; }

1 0

Huw Davies : cryptdlg: Add stubs for CertViewProperties.
by Alexandre Julliard 27 Aug '08

27 Aug '08

Module: wine Branch: master Commit: 1c3d02ad003647e50db5f79fb3fd9cc928a6e166 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c3d02ad003647e50db5f79fb… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Aug 26 12:43:02 2008 +0100 cryptdlg: Add stubs for CertViewProperties. --- dlls/cryptdlg/cryptdlg.spec | 4 ++-- dlls/cryptdlg/main.c | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/cryptdlg/cryptdlg.spec b/dlls/cryptdlg/cryptdlg.spec index 6556944..1536b10 100644 --- a/dlls/cryptdlg/cryptdlg.spec +++ b/dlls/cryptdlg/cryptdlg.spec @@ -13,8 +13,8 @@ 13 stub CertModifyCertificatesToTrust 14 stub CertSelectCertificateA 15 stub CertSelectCertificateW -16 stub CertViewPropertiesA -17 stub CertViewPropertiesW +16 stdcall CertViewPropertiesA(ptr) +17 stdcall CertViewPropertiesW(ptr) 18 stdcall -private DllRegisterServer() 19 stdcall -private DllUnregisterServer() 20 stdcall GetFriendlyNameOfCertA(ptr ptr long) diff --git a/dlls/cryptdlg/main.c b/dlls/cryptdlg/main.c index 316d83e..2447c38 100644 --- a/dlls/cryptdlg/main.c +++ b/dlls/cryptdlg/main.c @@ -106,6 +106,24 @@ HRESULT WINAPI CertTrustFinalPolicy(CRYPT_PROVIDER_DATA *pProvData) } /*********************************************************************** + * CertViewPropertiesA (CRYPTDLG.@) + */ +BOOL WINAPI CertViewPropertiesA(CERT_VIEWPROPERTIES_STRUCT_A *info) +{ + FIXME("(%p): stub\n", info); + return FALSE; +} + +/*********************************************************************** + * CertViewPropertiesW (CRYPTDLG.@) + */ +BOOL WINAPI CertViewPropertiesW(CERT_VIEWPROPERTIES_STRUCT_W *info) +{ + FIXME("(%p): stub\n", info); + return FALSE; +} + +/*********************************************************************** * DllRegisterServer (CRYPTDLG.@) */ HRESULT WINAPI DllRegisterServer(void)

1 0

Huw Davies : crypt32: Add support for CERT_NAME_STR_REVERSE_FLAG.
by Alexandre Julliard 27 Aug '08

27 Aug '08

Module: wine Branch: master Commit: 1319b367fc59fdd511cf2f9f72b4328f38d65429 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1319b367fc59fdd511cf2f9f7… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Aug 26 14:21:15 2008 +0100 crypt32: Add support for CERT_NAME_STR_REVERSE_FLAG. --- dlls/crypt32/str.c | 44 ++++++++++++++++++++++++++++---------------- dlls/crypt32/tests/str.c | 12 ++++++++++++ 2 files changed, 40 insertions(+), 16 deletions(-) diff --git a/dlls/crypt32/str.c b/dlls/crypt32/str.c index d574790..7a739a8 100644 --- a/dlls/crypt32/str.c +++ b/dlls/crypt32/str.c @@ -181,7 +181,7 @@ DWORD WINAPI CertNameToStrA(DWORD dwCertEncodingType, PCERT_NAME_BLOB pName, DWORD dwStrType, LPSTR psz, DWORD csz) { static const DWORD unsupportedFlags = CERT_NAME_STR_NO_QUOTING_FLAG | - CERT_NAME_STR_REVERSE_FLAG | CERT_NAME_STR_ENABLE_T61_UNICODE_FLAG; + CERT_NAME_STR_ENABLE_T61_UNICODE_FLAG; static const char commaSep[] = ", "; static const char semiSep[] = "; "; static const char crlfSep[] = "\r\n"; @@ -202,6 +202,10 @@ DWORD WINAPI CertNameToStrA(DWORD dwCertEncodingType, PCERT_NAME_BLOB pName, { DWORD i, j, sepLen, rdnSepLen; LPCSTR sep, rdnSep; + BOOL reverse = dwStrType & CERT_NAME_STR_REVERSE_FLAG; + const CERT_RDN *rdn = info->rgRDN; + + if(reverse && info->cRDN > 1) rdn += (info->cRDN - 1); if (dwStrType & CERT_NAME_STR_SEMICOLON_FLAG) sep = semiSep; @@ -217,19 +221,19 @@ DWORD WINAPI CertNameToStrA(DWORD dwCertEncodingType, PCERT_NAME_BLOB pName, rdnSepLen = strlen(rdnSep); for (i = 0; (!psz || ret < csz) && i < info->cRDN; i++) { - for (j = 0; (!psz || ret < csz) && j < info->rgRDN[i].cRDNAttr; j++) + for (j = 0; (!psz || ret < csz) && j < rdn->cRDNAttr; j++) { DWORD chars; char prefixBuf[10]; /* big enough for GivenName */ LPCSTR prefix = NULL; if ((dwStrType & 0x000000ff) == CERT_OID_NAME_STR) - prefix = info->rgRDN[i].rgRDNAttr[j].pszObjId; + prefix = rdn->rgRDNAttr[j].pszObjId; else if ((dwStrType & 0x000000ff) == CERT_X500_NAME_STR) { PCCRYPT_OID_INFO oidInfo = CryptFindOIDInfo( CRYPT_OID_INFO_OID_KEY, - info->rgRDN[i].rgRDNAttr[j].pszObjId, + rdn->rgRDNAttr[j].pszObjId, CRYPT_RDN_ATTR_OID_GROUP_ID); if (oidInfo) @@ -239,7 +243,7 @@ DWORD WINAPI CertNameToStrA(DWORD dwCertEncodingType, PCERT_NAME_BLOB pName, prefix = prefixBuf; } else - prefix = info->rgRDN[i].rgRDNAttr[j].pszObjId; + prefix = rdn->rgRDNAttr[j].pszObjId; } if (prefix) { @@ -250,12 +254,12 @@ DWORD WINAPI CertNameToStrA(DWORD dwCertEncodingType, PCERT_NAME_BLOB pName, } /* FIXME: handle quoting */ chars = CertRDNValueToStrA( - info->rgRDN[i].rgRDNAttr[j].dwValueType, - &info->rgRDN[i].rgRDNAttr[j].Value, psz ? psz + ret : NULL, + rdn->rgRDNAttr[j].dwValueType, + &rdn->rgRDNAttr[j].Value, psz ? psz + ret : NULL, psz ? csz - ret : 0); if (chars) ret += chars - 1; - if (j < info->rgRDN[i].cRDNAttr - 1) + if (j < rdn->cRDNAttr - 1) { if (psz && ret < csz - rdnSepLen - 1) memcpy(psz + ret, rdnSep, rdnSepLen); @@ -268,6 +272,8 @@ DWORD WINAPI CertNameToStrA(DWORD dwCertEncodingType, PCERT_NAME_BLOB pName, memcpy(psz + ret, sep, sepLen); ret += sepLen; } + if(reverse) rdn--; + else rdn++; } LocalFree(info); } @@ -336,7 +342,7 @@ DWORD WINAPI CertNameToStrW(DWORD dwCertEncodingType, PCERT_NAME_BLOB pName, DWORD dwStrType, LPWSTR psz, DWORD csz) { static const DWORD unsupportedFlags = CERT_NAME_STR_NO_QUOTING_FLAG | - CERT_NAME_STR_REVERSE_FLAG | CERT_NAME_STR_ENABLE_T61_UNICODE_FLAG; + CERT_NAME_STR_ENABLE_T61_UNICODE_FLAG; static const WCHAR commaSep[] = { ',',' ',0 }; static const WCHAR semiSep[] = { ';',' ',0 }; static const WCHAR crlfSep[] = { '\r','\n',0 }; @@ -357,6 +363,10 @@ DWORD WINAPI CertNameToStrW(DWORD dwCertEncodingType, PCERT_NAME_BLOB pName, { DWORD i, j, sepLen, rdnSepLen; LPCWSTR sep, rdnSep; + BOOL reverse = dwStrType & CERT_NAME_STR_REVERSE_FLAG; + const CERT_RDN *rdn = info->rgRDN; + + if(reverse && info->cRDN > 1) rdn += (info->cRDN - 1); if (dwStrType & CERT_NAME_STR_SEMICOLON_FLAG) sep = semiSep; @@ -372,25 +382,25 @@ DWORD WINAPI CertNameToStrW(DWORD dwCertEncodingType, PCERT_NAME_BLOB pName, rdnSepLen = lstrlenW(rdnSep); for (i = 0; (!psz || ret < csz) && i < info->cRDN; i++) { - for (j = 0; (!psz || ret < csz) && j < info->rgRDN[i].cRDNAttr; j++) + for (j = 0; (!psz || ret < csz) && j < rdn->cRDNAttr; j++) { DWORD chars; LPCSTR prefixA = NULL; LPCWSTR prefixW = NULL; if ((dwStrType & 0x000000ff) == CERT_OID_NAME_STR) - prefixA = info->rgRDN[i].rgRDNAttr[j].pszObjId; + prefixA = rdn->rgRDNAttr[j].pszObjId; else if ((dwStrType & 0x000000ff) == CERT_X500_NAME_STR) { PCCRYPT_OID_INFO oidInfo = CryptFindOIDInfo( CRYPT_OID_INFO_OID_KEY, - info->rgRDN[i].rgRDNAttr[j].pszObjId, + rdn->rgRDNAttr[j].pszObjId, CRYPT_RDN_ATTR_OID_GROUP_ID); if (oidInfo) prefixW = oidInfo->pwszName; else - prefixA = info->rgRDN[i].rgRDNAttr[j].pszObjId; + prefixA = rdn->rgRDNAttr[j].pszObjId; } if (prefixW) { @@ -408,12 +418,12 @@ DWORD WINAPI CertNameToStrW(DWORD dwCertEncodingType, PCERT_NAME_BLOB pName, } /* FIXME: handle quoting */ chars = CertRDNValueToStrW( - info->rgRDN[i].rgRDNAttr[j].dwValueType, - &info->rgRDN[i].rgRDNAttr[j].Value, psz ? psz + ret : NULL, + rdn->rgRDNAttr[j].dwValueType, + &rdn->rgRDNAttr[j].Value, psz ? psz + ret : NULL, psz ? csz - ret : 0); if (chars) ret += chars - 1; - if (j < info->rgRDN[i].cRDNAttr - 1) + if (j < rdn->cRDNAttr - 1) { if (psz && ret < csz - rdnSepLen - 1) memcpy(psz + ret, rdnSep, rdnSepLen * sizeof(WCHAR)); @@ -426,6 +436,8 @@ DWORD WINAPI CertNameToStrW(DWORD dwCertEncodingType, PCERT_NAME_BLOB pName, memcpy(psz + ret, sep, sepLen * sizeof(WCHAR)); ret += sepLen; } + if(reverse) rdn--; + else rdn++; } LocalFree(info); } diff --git a/dlls/crypt32/tests/str.c b/dlls/crypt32/tests/str.c index e4cdb77..5b2e025 100644 --- a/dlls/crypt32/tests/str.c +++ b/dlls/crypt32/tests/str.c @@ -119,6 +119,7 @@ static char subjectStrSemicolon[] = static char subjectStrCRLF[] = "2.5.4.6=US\r\n2.5.4.8=Minnesota\r\n2.5.4.7=Minneapolis\r\n2.5.4.10=CodeWeavers\r\n2.5.4.11=Wine Development\r\n2.5.4.3=localhost\r\n1.2.840.113549.1.9.1=aric(a)codeweavers…"; static char x500SubjectStr[] = "C=US, S=Minnesota, L=Minneapolis, O=CodeWeavers, OU=Wine Development, CN=localhost, E=aric(a)codeweavers.com"; +static char x500SubjectStrSemicolonReverse[] = "E=aric(a)codeweavers.com; CN=localhost; OU=Wine Development; O=CodeWeavers; L=Minneapolis; S=Minnesota; C=US"; static WCHAR issuerStrW[] = { 'U','S',',',' ','M','i','n','n','e','s','o','t','a',',',' ','M','i','n','n', 'e','a','p','o','l','i','s',',',' ','C','o','d','e','W','e','a','v','e','r', @@ -167,6 +168,13 @@ static WCHAR subjectStrCRLFW[] = { 'h','o','s','t','\r','\n','1','.','2','.','8','4','0','.','1','1','3','5','4', '9','.','1','.','9','.','1','=','a','r','i','c','@','c','o','d','e','w','e', 'a','v','e','r','s','.','c','o','m',0 }; +static WCHAR x500SubjectStrSemicolonReverseW[] = { + 'E','=','a','r','i','c','@','c','o','d','e','w','e','a','v','e','r','s','.','c', + 'o','m',';',' ','C','N','=','l','o','c','a','l','h','o','s','t',';',' ','O','U', + '=','W','i','n','e',' ','D','e','v','e','l','o','p','m','e','n','t',';',' ','O', + '=','C','o','d','e','W','e','a','v','e','r','s',';',' ','L','=','M','i','n','n', + 'e','a','p','o','l','i','s',';',' ','S','=','M','i','n','n','e','s','o','t','a', + ';',' ','C','=','U','S',0 }; typedef BOOL (WINAPI *CryptDecodeObjectFunc)(DWORD, LPCSTR, const BYTE *, DWORD, DWORD, void *, DWORD *); @@ -371,6 +379,8 @@ static void test_CertNameToStrA(void) subjectStrCRLF); test_NameToStrConversionA(&context->pCertInfo->Subject, CERT_X500_NAME_STR, x500SubjectStr); + test_NameToStrConversionA(&context->pCertInfo->Subject, + CERT_X500_NAME_STR | CERT_NAME_STR_SEMICOLON_FLAG | CERT_NAME_STR_REVERSE_FLAG, x500SubjectStrSemicolonReverse); CertFreeCertificateContext(context); } @@ -446,6 +456,8 @@ static void test_CertNameToStrW(void) test_NameToStrConversionW(&context->pCertInfo->Subject, CERT_OID_NAME_STR | CERT_NAME_STR_CRLF_FLAG, subjectStrCRLFW); + test_NameToStrConversionW(&context->pCertInfo->Subject, + CERT_X500_NAME_STR | CERT_NAME_STR_SEMICOLON_FLAG | CERT_NAME_STR_REVERSE_FLAG, x500SubjectStrSemicolonReverseW); CertFreeCertificateContext(context); }

1 0

Alexandre Julliard : wininet: Avoid testing errno when it isn't set. Simplify NETCON_getNextLine a bit.
by Alexandre Julliard 27 Aug '08

27 Aug '08

Module: wine Branch: master Commit: 9bded7bb2a344dc153fd2ece519bafd12e93040b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bded7bb2a344dc153fd2ece5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 26 20:40:09 2008 +0200 wininet: Avoid testing errno when it isn't set. Simplify NETCON_getNextLine a bit. --- dlls/wininet/netconnection.c | 33 ++++++++++----------------------- 1 files changed, 10 insertions(+), 23 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index f55fbf2..7f6fed7 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -634,8 +634,8 @@ BOOL NETCON_getNextLine(WININET_NETCONNECTION *connection, LPSTR lpszBuffer, LPD if (!connection->useSSL) { struct pollfd pfd; - BOOL bSuccess = FALSE; DWORD nRecv = 0; + int ret; pfd.fd = connection->socketFD; pfd.events = POLLIN; @@ -644,16 +644,18 @@ BOOL NETCON_getNextLine(WININET_NETCONNECTION *connection, LPSTR lpszBuffer, LPD { if (poll(&pfd,1, RESPONSE_TIMEOUT * 1000) > 0) { - if (recv(connection->socketFD, &lpszBuffer[nRecv], 1, 0) <= 0) + if ((ret = recv(connection->socketFD, &lpszBuffer[nRecv], 1, 0)) <= 0) { - INTERNET_SetLastError(sock_get_error(errno)); - goto lend; + if (ret == -1) INTERNET_SetLastError(sock_get_error(errno)); + break; } if (lpszBuffer[nRecv] == '\n') { - bSuccess = TRUE; - break; + lpszBuffer[nRecv++] = '\0'; + *dwBuffer = nRecv; + TRACE(":%u %s\n", nRecv, lpszBuffer); + return TRUE; } if (lpszBuffer[nRecv] != '\r') nRecv++; @@ -661,22 +663,9 @@ BOOL NETCON_getNextLine(WININET_NETCONNECTION *connection, LPSTR lpszBuffer, LPD else { INTERNET_SetLastError(ERROR_INTERNET_TIMEOUT); - goto lend; + break; } } - - lend: /* FIXME: don't use labels */ - if (bSuccess) - { - lpszBuffer[nRecv++] = '\0'; - *dwBuffer = nRecv; - TRACE(":%u %s\n", nRecv, lpszBuffer); - return TRUE; - } - else - { - return FALSE; - } } else { @@ -714,11 +703,9 @@ BOOL NETCON_getNextLine(WININET_NETCONNECTION *connection, LPSTR lpszBuffer, LPD TRACE("_SSL:%u %s\n", nRecv, lpszBuffer); return TRUE; } - return FALSE; -#else - return FALSE; #endif } + return FALSE; }

1 0

Alexandre Julliard : wininet/tests: Add a couple more optional notifications.
by Alexandre Julliard 27 Aug '08

27 Aug '08

Module: wine Branch: master Commit: 8f3a7a8494efba0266903e3ef5b62123a6d3d647 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f3a7a8494efba0266903e3ef… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 26 20:40:28 2008 +0200 wininet/tests: Add a couple more optional notifications. --- dlls/wininet/tests/http.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 7cd4abe..9ad6274 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -569,6 +569,8 @@ static void InternetReadFileExA_test(int flags) SET_OPTIONAL(INTERNET_STATUS_CLOSING_CONNECTION); SET_OPTIONAL(INTERNET_STATUS_CONNECTION_CLOSED); SET_EXPECT(INTERNET_STATUS_REDIRECT); + SET_OPTIONAL(INTERNET_STATUS_CONNECTING_TO_SERVER); + SET_OPTIONAL(INTERNET_STATUS_CONNECTED_TO_SERVER); if (flags & INTERNET_FLAG_ASYNC) SET_EXPECT(INTERNET_STATUS_REQUEST_COMPLETE); else

1 0