September 2008 - Wine-commits

Alexandre Julliard : winetest: For tests run on Wine, enforce that the Wine version is not older than the test build.
by Alexandre Julliard 11 Sep '08

11 Sep '08

Module: tools Branch: master Commit: debcd82f5f6947d518ef26b40da508de87e544e8 URL: http://source.winehq.org/git/tools.git/?a=commit;h=debcd82f5f6947d518ef26b4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 11 20:36:38 2008 +0200 winetest: For tests run on Wine, enforce that the Wine version is not older than the test build. --- winetest/dissect | 24 +++++++++++++++++++++++- 1 files changed, 23 insertions(+), 1 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index d3782cb..17a5c4b 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -124,7 +124,7 @@ while (($_ = <IN>) =~ s/^ //) } $box->{data} .= "</div>"; -my ($wine, $version, $major, $minor, $plid, $product); +my ($wine, $wine_build, $version, $major, $minor, $plid, $product); /^Operating system version:\r?$/ or mydie "no OS header: $_"; $box = create_box( "version", "version", "Operating system version" ); $box->{data} .= "<table class=\"output\">\n"; @@ -140,6 +140,8 @@ while (($_ = <IN>) =~ /^\s*([0-9a-zA-Z ]+)=(.*?)\r?$/) { $plid = $2; } elsif ($1 eq "wProductType") { $product = $2; + } elsif ($1 eq "WineBuild") { + $wine_build = $2; } } $box->{data} .= "</table>"; @@ -180,6 +182,26 @@ if ($wine) { $tag = "_$version$tag"; $version = "wine"; } +if ($wine_build) { + my $wine_commit; + if ($wine_build =~ /-g([0-9a-f]+)$/) + { + $wine_commit = `git rev-parse --verify $1^0 2>/dev/null`; + } + elsif ($wine_build =~ /^[-+._0-9A-Za-z]+$/) + { + $wine_commit = `git rev-parse --verify $wine_build^0 2>/dev/null`; + } + else + { + mydie "invalid wine build '$wine_build'\n"; + } + chomp $wine_commit; + mydie "unknown wine build '$wine_build'\n" unless $wine_commit; + my $merge_base = `git merge-base $wine_commit $testbuild 2>/dev/null`; + chomp $merge_base; + $merge_base eq $testbuild or mydie "wine build '$wine_build' not a descendant of build $testbuild\n"; +} my %dllinfo; /^Dll info:\r?$/ or mydie "no Dll info header: $_";

1 0

Kai Blin : ws2_32: Win98 closesocket() does not wake up select.
by Alexandre Julliard 11 Sep '08

11 Sep '08

Module: wine Branch: master Commit: 4b4109a6470348533c44cab8bef6be7e631c3f3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b4109a6470348533c44cab8b… Author: Kai Blin <kai.blin(a)gmail.com> Date: Thu Sep 11 14:30:41 2008 +0200 ws2_32: Win98 closesocket() does not wake up select. --- dlls/ws2_32/tests/sock.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 01399b1..715516d 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1687,7 +1687,9 @@ static void test_select(void) ok ( (ret == 0), "closesocket failed unexpectedly: %d\n", ret); WaitForSingleObject (thread_handle, 1000); - ok ( (thread_params.ReadKilled), "closesocket did not wakeup select\n"); + ok ( (thread_params.ReadKilled) || + broken(thread_params.ReadKilled == 0), /*Win98*/ + "closesocket did not wakeup select\n"); }

1 0

Kai Blin : ws2_32: Win NT4 does not zero the sockaddr_in structure on getsockname.
by Alexandre Julliard 11 Sep '08

11 Sep '08

Module: wine Branch: master Commit: 93f1d4874345286c61afc619ae4b9f6b6e0e9e0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=93f1d4874345286c61afc619a… Author: Kai Blin <kai.blin(a)gmail.com> Date: Thu Sep 11 14:23:37 2008 +0200 ws2_32: Win NT4 does not zero the sockaddr_in structure on getsockname. All other versions of windows do, and this makes native dplay traces much more readable, which is why Wine implements this as well. Mark NT4 as broken, to make sure Wine doesn't regress. --- dlls/ws2_32/tests/sock.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 0643d00..01399b1 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1858,6 +1858,7 @@ static void test_getsockname(void) int sa_set_len = sizeof(struct sockaddr_in); int sa_get_len = sa_set_len; static const unsigned char null_padding[] = {0,0,0,0,0,0,0,0}; + int ret; if(WSAStartup(MAKEWORD(2,0), &wsa)){ trace("Winsock failed: %d. Aborting test\n", WSAGetLastError()); @@ -1900,7 +1901,8 @@ static void test_getsockname(void) return; } - ok(memcmp(sa_get.sin_zero, null_padding, 8) == 0, + ret = memcmp(sa_get.sin_zero, null_padding, 8); + ok(ret == 0 || broken(ret != 0), /* NT4 */ "getsockname did not zero the sockaddr_in structure\n"); closesocket(sock);

1 0

Hans Leidekker : winhttp: Strip content-type/ length headers from request on a redirect.
by Alexandre Julliard 11 Sep '08

11 Sep '08

Module: wine Branch: master Commit: 10090eb2527ec86eec6c011b1d7c7f2318ea0c55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10090eb2527ec86eec6c011b1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Sep 11 14:20:06 2008 +0200 winhttp: Strip content-type/length headers from request on a redirect. --- dlls/winhttp/request.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 6564e28..c149aca 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1048,6 +1048,7 @@ static BOOL handle_redirect( request_t *request ) connect_t *connect = request->connect; INTERNET_PORT port; WCHAR *hostname = NULL, *location = NULL; + int index; size = 0; query_headers( request, WINHTTP_QUERY_LOCATION, NULL, NULL, &size, NULL ); @@ -1115,6 +1116,10 @@ static BOOL handle_redirect( request_t *request ) } } + /* remove content-type/length headers */ + if ((index = get_header_index( request, attr_content_type, 0, TRUE )) >= 0) delete_header( request, index ); + if ((index = get_header_index( request, attr_content_length, 0, TRUE )) >= 0 ) delete_header( request, index ); + /* redirects are always GET requests */ heap_free( request->verb ); request->verb = NULL;

1 0

Hans Leidekker : winhttp: Preserve cookies on redirects.
by Alexandre Julliard 11 Sep '08

11 Sep '08

Module: wine Branch: master Commit: bddcb1b8bbb13e9ca87cb28f78f06f06c83f69b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bddcb1b8bbb13e9ca87cb28f7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Sep 11 14:19:45 2008 +0200 winhttp: Preserve cookies on redirects. --- dlls/winhttp/request.c | 27 +++++++++++++++++++++------ 1 files changed, 21 insertions(+), 6 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 6ff2fec..6564e28 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -940,7 +940,7 @@ static void clear_response_headers( request_t *request ) #define MAX_REPLY_LEN 1460 #define INITIAL_HEADER_BUFFER_LEN 512 -static BOOL read_reply( request_t *request, BOOL clear ) +static BOOL read_reply( request_t *request ) { static const WCHAR crlf[] = {'\r','\n',0}; @@ -952,9 +952,6 @@ static BOOL read_reply( request_t *request, BOOL clear ) if (!netconn_connected( &request->netconn )) return FALSE; - /* clear old response headers (eg. from a redirect response) */ - if (clear) clear_response_headers( request ); - send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE, NULL, 0 ); received_len = 0; @@ -1184,7 +1181,7 @@ static BOOL receive_data_chunked( request_t *request, void *buffer, DWORD size, if (!(request->content_length = get_chunk_size( reply ))) { /* zero sized chunk marks end of transfer; read any trailing headers and return */ - read_reply( request, FALSE ); + read_reply( request ); break; } } @@ -1267,6 +1264,20 @@ static void drain_content( request_t *request ) } } +/* copy cookies from response headers to request headers */ +static void add_cookies( request_t *request ) +{ + unsigned int i; + + for (i = 0; i < request->num_headers; i++) + { + if (!strcmpiW( request->headers[i].field, attr_set_cookie ) && !request->headers[i].is_request) + { + process_header( request, attr_cookie, request->headers[i].value, WINHTTP_ADDREQ_FLAG_ADD, TRUE ); + } + } +} + static BOOL receive_response( request_t *request, BOOL async ) { BOOL ret; @@ -1274,7 +1285,7 @@ static BOOL receive_response( request_t *request, BOOL async ) for (;;) { - if (!(ret = read_reply( request, TRUE ))) break; + if (!(ret = read_reply( request ))) break; size = sizeof(DWORD); query = WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER; @@ -1289,7 +1300,11 @@ static BOOL receive_response( request_t *request, BOOL async ) { if (request->hdr.disable_flags & WINHTTP_DISABLE_REDIRECTS) break; drain_content( request ); + if (!(ret = handle_redirect( request ))) break; + if (!(request->hdr.disable_flags & WINHTTP_DISABLE_COOKIES)) add_cookies( request ); + + clear_response_headers( request ); ret = send_request( request, NULL, 0, NULL, 0, 0, 0, FALSE ); /* recurse synchronously */ continue; }

1 0

Huw Davies : inetcomm: Implement IMimeInternational_CanConvertCodePages.
by Alexandre Julliard 11 Sep '08

11 Sep '08

Module: wine Branch: master Commit: 5d3b4a60f24b649e2550370aff56cfce6197b63c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d3b4a60f24b649e2550370af… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Sep 11 10:42:25 2008 +0100 inetcomm: Implement IMimeInternational_CanConvertCodePages. --- dlls/inetcomm/mimeintl.c | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/inetcomm/mimeintl.c b/dlls/inetcomm/mimeintl.c index 48848b8..92df2fb 100644 --- a/dlls/inetcomm/mimeintl.c +++ b/dlls/inetcomm/mimeintl.c @@ -311,8 +311,21 @@ static HRESULT WINAPI MimeInternat_GetCodePageInfo(IMimeInternational *iface, CO static HRESULT WINAPI MimeInternat_CanConvertCodePages(IMimeInternational *iface, CODEPAGEID cpiSource, CODEPAGEID cpiDest) { - FIXME("stub\n"); - return E_NOTIMPL; + HRESULT hr; + IMultiLanguage *ml; + + TRACE("(%p)->(%d, %d)\n", iface, cpiSource, cpiDest); + + /* Could call mlang.IsConvertINetStringAvailable() to avoid the COM overhead if need be. */ + + hr = get_mlang(&ml); + if(SUCCEEDED(hr)) + { + hr = IMultiLanguage_IsConvertible(ml, cpiSource, cpiDest); + IMultiLanguage_Release(ml); + } + + return hr; } static HRESULT WINAPI MimeInternat_DecodeHeader(IMimeInternational *iface, HCHARSET hCharset,

1 0

Huw Davies : inetcomm: Add a missing function and fix some idl.
by Alexandre Julliard 11 Sep '08

11 Sep '08

Module: wine Branch: master Commit: 2fa80dacde4086a72fb344c03415784a1849da2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fa80dacde4086a72fb344c03… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Sep 11 10:34:26 2008 +0100 inetcomm: Add a missing function and fix some idl. --- dlls/inetcomm/mimeintl.c | 8 ++++++++ include/mimeole.idl | 11 +++++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/inetcomm/mimeintl.c b/dlls/inetcomm/mimeintl.c index 666f33a..48848b8 100644 --- a/dlls/inetcomm/mimeintl.c +++ b/dlls/inetcomm/mimeintl.c @@ -308,6 +308,13 @@ static HRESULT WINAPI MimeInternat_GetCodePageInfo(IMimeInternational *iface, CO return E_NOTIMPL; } +static HRESULT WINAPI MimeInternat_CanConvertCodePages(IMimeInternational *iface, CODEPAGEID cpiSource, + CODEPAGEID cpiDest) +{ + FIXME("stub\n"); + return E_NOTIMPL; +} + static HRESULT WINAPI MimeInternat_DecodeHeader(IMimeInternational *iface, HCHARSET hCharset, LPCSTR pszData, LPPROPVARIANT pDecoded, @@ -390,6 +397,7 @@ static IMimeInternationalVtbl mime_internat_vtbl = MimeInternat_FindCharset, MimeInternat_GetCharsetInfo, MimeInternat_GetCodePageInfo, + MimeInternat_CanConvertCodePages, MimeInternat_DecodeHeader, MimeInternat_EncodeHeader, MimeInternat_ConvertBuffer, diff --git a/include/mimeole.idl b/include/mimeole.idl index 191a9f2..f4cffda 100644 --- a/include/mimeole.idl +++ b/include/mimeole.idl @@ -252,6 +252,9 @@ library MIMEOLE HRESULT GetCodePageInfo( [in] CODEPAGEID cpiCodePage, [in, out] LPCODEPAGEINFO pCodePageInfo); + HRESULT CanConvertCodePages( + [in] CODEPAGEID cpiSource, + [in] CODEPAGEID cpiDest); HRESULT DecodeHeader( [in] HCHARSET hCharset, [in] LPCSTR pszData, @@ -273,22 +276,22 @@ library MIMEOLE [in] CODEPAGEID cpiDest, [in] LPPROPVARIANT pIn, [in, out] LPPROPVARIANT pOut); - HRESULT MLANG_ConvertInetReset(); + HRESULT MLANG_ConvertInetReset(void); HRESULT MLANG_ConvertInetString( [in] CODEPAGEID cpiSource, [in] CODEPAGEID cpiDest, [in] LPCSTR pSource, [in] int *pnSizeOfSource, - [out] LPSTR pDestination, + [in,out,unique] LPSTR pDestination, [in] int *pnDstSize); HRESULT Rfc1522Decode( [in] LPCSTR pszValue, - [in] LPCSTR pszCharset, + [in,ref] LPCSTR pszCharset, [in] ULONG cchmax, [out] LPSTR *ppszDecoded); HRESULT Rfc1522Encode( [in] LPCSTR pszValue, - [in] HCHARSET hCharset, + [in] HCHARSET hCharset, [out] LPSTR *ppszEncoded); }

1 0

Huw Davies : inetcomm/tests: Add a test for IMimeInternational_SetDefaultCharset.
by Alexandre Julliard 11 Sep '08

11 Sep '08

Module: wine Branch: master Commit: ef180ec3e7a8966238d19ad331b64d66aaa00c52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef180ec3e7a8966238d19ad33… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Sep 10 14:51:45 2008 +0100 inetcomm/tests: Add a test for IMimeInternational_SetDefaultCharset. --- dlls/inetcomm/tests/mimeintl.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/inetcomm/tests/mimeintl.c b/dlls/inetcomm/tests/mimeintl.c index 746628a..0fc514f 100644 --- a/dlls/inetcomm/tests/mimeintl.c +++ b/dlls/inetcomm/tests/mimeintl.c @@ -185,7 +185,7 @@ static void test_defaultcharset(void) { IMimeInternational *internat; HRESULT hr; - HCHARSET hcs_default, hcs; + HCHARSET hcs_default, hcs, hcs_windows_1251; hr = MimeOleGetInternat(&internat); ok(hr == S_OK, "ret %08x\n", hr); @@ -196,6 +196,17 @@ static void test_defaultcharset(void) ok(hr == S_OK, "ret %08x\n", hr); ok(hcs_default == hcs, "Unexpected default charset\n"); + hr = IMimeInternational_FindCharset(internat, "windows-1251", &hcs_windows_1251); + ok(hr == S_OK, "got %08x\n", hr); + hr = IMimeInternational_SetDefaultCharset(internat, hcs_windows_1251); + ok(hr == S_OK, "ret %08x\n", hr); + hr = IMimeInternational_GetDefaultCharset(internat, &hcs); + ok(hr == S_OK, "ret %08x\n", hr); + ok(hcs == hcs_windows_1251, "didn't retrieve recently set default\n"); + /* Set the old default back again */ + hr = IMimeInternational_SetDefaultCharset(internat, hcs_default); + ok(hr == S_OK, "ret %08x\n", hr); + IMimeInternational_Release(internat); }

1 0

Huw Davies : inetcomm/tests: Add test for IMimeInternational_GetDefaultCharset.
by Alexandre Julliard 11 Sep '08

11 Sep '08

Module: wine Branch: master Commit: 4271524b8a4e77a937b4c6e065f760f9c3bef9b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4271524b8a4e77a937b4c6e06… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Sep 10 14:42:42 2008 +0100 inetcomm/tests: Add test for IMimeInternational_GetDefaultCharset. --- dlls/inetcomm/tests/mimeintl.c | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/dlls/inetcomm/tests/mimeintl.c b/dlls/inetcomm/tests/mimeintl.c index 029798a..746628a 100644 --- a/dlls/inetcomm/tests/mimeintl.c +++ b/dlls/inetcomm/tests/mimeintl.c @@ -181,10 +181,29 @@ static void test_charset(void) IMimeInternational_Release(internat); } +static void test_defaultcharset(void) +{ + IMimeInternational *internat; + HRESULT hr; + HCHARSET hcs_default, hcs; + + hr = MimeOleGetInternat(&internat); + ok(hr == S_OK, "ret %08x\n", hr); + + hr = IMimeInternational_GetDefaultCharset(internat, &hcs_default); + ok(hr == S_OK, "ret %08x\n", hr); + hr = IMimeInternational_GetCodePageCharset(internat, GetACP(), CHARSET_BODY, &hcs); + ok(hr == S_OK, "ret %08x\n", hr); + ok(hcs_default == hcs, "Unexpected default charset\n"); + + IMimeInternational_Release(internat); +} + START_TEST(mimeintl) { OleInitialize(NULL); test_create(); test_charset(); + test_defaultcharset(); OleUninitialize(); }

1 0

Huw Davies : inetcomm: Implement IMimeInternational_SetDefaultCharset.
by Alexandre Julliard 11 Sep '08

11 Sep '08

Module: wine Branch: master Commit: ed39ba45394b9f1df5e3b7216b8d5b23fdf1737f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed39ba45394b9f1df5e3b7216… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Sep 10 14:46:16 2008 +0100 inetcomm: Implement IMimeInternational_SetDefaultCharset. --- dlls/inetcomm/mimeintl.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/inetcomm/mimeintl.c b/dlls/inetcomm/mimeintl.c index f314740..666f33a 100644 --- a/dlls/inetcomm/mimeintl.c +++ b/dlls/inetcomm/mimeintl.c @@ -111,8 +111,16 @@ static ULONG WINAPI MimeInternat_Release( IMimeInternational *iface ) static HRESULT WINAPI MimeInternat_SetDefaultCharset(IMimeInternational *iface, HCHARSET hCharset) { - FIXME("stub\n"); - return E_NOTIMPL; + internat *This = impl_from_IMimeInternational( iface ); + + TRACE("(%p)->(%p)\n", iface, hCharset); + + if(hCharset == NULL) return E_INVALIDARG; + /* FIXME check hCharset is valid */ + + InterlockedExchangePointer(&This->default_charset, hCharset); + + return S_OK; } static HRESULT WINAPI MimeInternat_GetDefaultCharset(IMimeInternational *iface, LPHCHARSET phCharset)

1 0