October 2015 - Wine-Commits

Dmitry Timoshkov : oleaut32/tests: Fix compilation of typelib test with PSDK tools.
by Alexandre Julliard Oct. 6, 2015

Oct. 6, 2015

Module: wine Branch: master Commit: ed0c9ba69465ef0e613f346bd067e37eeebc6e97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed0c9ba69465ef0e613f346bd… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 5 20:36:08 2015 +0800 oleaut32/tests: Fix compilation of typelib test with PSDK tools. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/oleaut32/tests/typelib.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 3ce2bd7..0c3ab84 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -19,6 +19,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define NONAMELESSSTRUCT +#define NONAMELESSUNION + #define COBJMACROS #define CONST_VTABLE @@ -71,8 +74,8 @@ #define ARCH "none" #endif -static HRESULT WINAPI (*pRegisterTypeLibForUser)(ITypeLib*,OLECHAR*,OLECHAR*); -static HRESULT WINAPI (*pUnRegisterTypeLibForUser)(REFGUID,WORD,WORD,LCID,SYSKIND); +static HRESULT (WINAPI *pRegisterTypeLibForUser)(ITypeLib*,OLECHAR*,OLECHAR*); +static HRESULT (WINAPI *pUnRegisterTypeLibForUser)(REFGUID,WORD,WORD,LCID,SYSKIND); static BOOL (WINAPI *pActivateActCtx)(HANDLE,ULONG_PTR*); static HANDLE (WINAPI *pCreateActCtxW)(PCACTCTXW); @@ -3773,12 +3776,12 @@ static void test_dump_typelib(const char *name) desc->callconv); printf(" /*#param*/ %d, /*#opt*/ %d, /*vtbl*/ %d, /*#scodes*/ %d, /*flags*/ 0x%x,\n", desc->cParams, desc->cParamsOpt, desc->oVft, desc->cScodes, desc->wFuncFlags); - printf(" {%d, %x}, /* ret */\n", desc->elemdescFunc.tdesc.vt, desc->elemdescFunc.paramdesc.wParamFlags); + printf(" {%d, %x}, /* ret */\n", desc->elemdescFunc.tdesc.vt, U(desc->elemdescFunc).paramdesc.wParamFlags); printf(" { /* params */\n"); for (p = 0; p < desc->cParams; p++) { ELEMDESC e = desc->lprgelemdescParam[p]; - printf(" {%d, %x},\n", e.tdesc.vt, e.paramdesc.wParamFlags); + printf(" {%d, %x},\n", e.tdesc.vt, U(e).paramdesc.wParamFlags); } printf(" {-1, -1}\n"); printf(" },\n");

1 0

Dmitry Timoshkov : widl: Do not create duplicate type info entries when tag and typedef names are the same.
by Alexandre Julliard Oct. 6, 2015

Oct. 6, 2015

Module: wine Branch: master Commit: fb5293f0ce5c0218c5ab89dc9e3195f184b88337 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb5293f0ce5c0218c5ab89dc9… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 5 20:36:02 2015 +0800 widl: Do not create duplicate type info entries when tag and typedef names are the same. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/winhttp/tests/winhttp.c | 1 - tools/widl/write_msft.c | 33 ++++++++++++++++++++++----------- 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index e221809..bd6b47f 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -3780,7 +3780,6 @@ todo_wine VariantInit(&ret); hr = IWinHttpRequest_Invoke(request, DISPID_HTTPREQUEST_SETAUTOLOGONPOLICY, &IID_NULL, 0, DISPATCH_METHOD, &params, &ret, NULL, NULL); -todo_wine ok(hr == S_OK, "error %#x\n", hr); IWinHttpRequest_Release(request); diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 26600e4..a39e986 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -1836,7 +1836,7 @@ static msft_typeinfo_t *create_msft_typeinfo(msft_typelib_t *typelib, enum type_ MSFT_TypeInfoBase *typeinfo; MSFT_GuidEntry guidentry; - chat("create_msft_typeinfo: name %s kind %d\n", name, kind); + chat("create_msft_typeinfo: name %s kind %d index %d\n", name, kind, typelib->typelib_header.nrtypeinfos); msft_typeinfo = xmalloc(sizeof(*msft_typeinfo)); memset( msft_typeinfo, 0, sizeof(*msft_typeinfo) ); @@ -2143,20 +2143,31 @@ static void add_enum_typeinfo(msft_typelib_t *typelib, type_t *enumeration) static void add_typedef_typeinfo(msft_typelib_t *typelib, type_t *tdef) { - msft_typeinfo_t *msft_typeinfo; - int alignment; + msft_typeinfo_t *msft_typeinfo = NULL; + int alignment, datatype1, datatype2, size; + type_t *type; if (-1 < tdef->typelib_idx) return; - tdef->typelib_idx = typelib->typelib_header.nrtypeinfos; - msft_typeinfo = create_msft_typeinfo(typelib, TKIND_ALIAS, tdef->name, tdef->attrs); - encode_type(typelib, get_type_vt(type_alias_get_aliasee(tdef)), - type_alias_get_aliasee(tdef), - &msft_typeinfo->typeinfo->datatype1, - &msft_typeinfo->typeinfo->size, - &alignment, &msft_typeinfo->typeinfo->datatype2); - msft_typeinfo->typeinfo->typekind |= (alignment << 11 | alignment << 6); + type = type_alias_get_aliasee(tdef); + + if (!type->name || strcmp(tdef->name, type->name) != 0) + { + tdef->typelib_idx = typelib->typelib_header.nrtypeinfos; + msft_typeinfo = create_msft_typeinfo(typelib, TKIND_ALIAS, tdef->name, tdef->attrs); + } + + encode_type(typelib, get_type_vt(type), type, + &datatype1, &size, &alignment, &datatype2); + + if (msft_typeinfo) + { + msft_typeinfo->typeinfo->datatype1 = datatype1; + msft_typeinfo->typeinfo->size = size; + msft_typeinfo->typeinfo->datatype2 = datatype2; + msft_typeinfo->typeinfo->typekind |= (alignment << 11 | alignment << 6); + } } static void add_coclass_typeinfo(msft_typelib_t *typelib, type_t *cls)

1 0

Andrew Eikum : xaudio2_2: Add compatibility implementation and forward to xaudio2_7.
by Alexandre Julliard Oct. 6, 2015

Oct. 6, 2015

Module: wine Branch: master Commit: 831095ed9335bd75f29ff3d2ab1233ead6935b92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=831095ed9335bd75f29ff3d2a… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Oct 5 11:33:03 2015 -0500 xaudio2_2: Add compatibility implementation and forward to xaudio2_7. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- configure | 2 + configure.ac | 1 + dlls/xaudio2_2/Makefile.in | 7 ++ dlls/xaudio2_2/xaudio2_2.spec | 4 + dlls/xaudio2_2/xaudio_classes.idl | 28 +++++ dlls/xaudio2_2/xaudio_dll.c | 52 ++++++++ dlls/xaudio2_7/compat.c | 252 ++++++++++++++++++++++++++++++++++++++ dlls/xaudio2_7/xaudio_classes.idl | 7 ++ dlls/xaudio2_7/xaudio_dll.c | 17 ++- dlls/xaudio2_7/xaudio_private.h | 3 + include/xaudio2.idl | 85 +++++++++++++ 11 files changed, 454 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=831095ed9335bd75f29ff…

1 0

Alexandre Julliard : patches: Display Signed-off-by information.
by Alexandre Julliard Oct. 6, 2015

Oct. 6, 2015

Module: tools Branch: master Commit: 7cc88583d998bb78c4833e5b45260d98a5e12810 URL: http://source.winehq.org/git/tools.git/?a=commit;h=7cc88583d998bb78c4833e5b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 6 22:58:11 2015 +0900 patches: Display Signed-off-by information. --- patches/expire | 3 +++ patches/patches.css | 1 + patches/update | 27 +++++++++++++++++++++++---- 3 files changed, 27 insertions(+), 4 deletions(-) diff --git a/patches/expire b/patches/expire index e092a71..a3b99c1 100755 --- a/patches/expire +++ b/patches/expire @@ -120,6 +120,7 @@ foreach my $file (sort readdir DIR) rename "$dir/$file", "$dir/OLD/$file"; rename "$dir/$file.status", "$dir/OLD/$file.status"; rename "$dir/$file.order", "$dir/OLD/$file.order"; + rename "$dir/$file.signoff", "$dir/OLD/$file.signoff"; rename "$dir/$file.testbot", "$dir/OLD/$file.testbot"; rename "$dir/$file.testfail", "$dir/OLD/$file.testfail"; } @@ -132,6 +133,7 @@ foreach my $file (sort readdir DIR) unlink "$dir/$file"; unlink "$dir/$file.status"; unlink "$dir/$file.order"; + unlink "$dir/$file.signoff"; unlink "$dir/$file.testbot"; unlink "$dir/$file.testfail"; } @@ -162,6 +164,7 @@ foreach my $file (sort readdir DIR) unlink "$dir/OLD/$file"; unlink "$dir/OLD/$file.status"; unlink "$dir/OLD/$file.order"; + unlink "$dir/OLD/$file.signoff"; unlink "$dir/OLD/$file.testbot"; unlink "$dir/OLD/$file.testfail"; } diff --git a/patches/patches.css b/patches/patches.css index b47d244..5706681 100644 --- a/patches/patches.css +++ b/patches/patches.css @@ -140,6 +140,7 @@ tr.odd { background-color: #f8e8e8; } .id, .status, .testbot { text-align: center; } .id, .status, .author { white-space: nowrap; padding: 0 3px; } +.checkmark { text-align: center; color:green; } .sha1 { white-space: nowrap; font-family: monospace; padding: 2px 12px; } .id :link, .sha1 :link, .subject :link { color: #A50D0D; text-decoration: none; } diff --git a/patches/update b/patches/update index 576b405..aa8d8c9 100755 --- a/patches/update +++ b/patches/update @@ -92,9 +92,9 @@ my %patches; sub format_author($) { - my $_ = shift; - if (/\s*((\"(.*)\")|(.*))\s*<(\S+\@\S+)>/) { return $3 || $4 || $5; } - return $_; + my $str = shift; + if ($str =~ /\s*((\"(.*)\")|(.*))\s*<(\S+\@\S+)>/) { return $3 || $4 || $5; } + return $str; } open INDEX, "> $dest/index.html.new" or die "cannot create $dest/index.html.new"; @@ -117,6 +117,7 @@ print INDEX "<table class=\"main\"><tr><th class=\"id\">ID</th>", "<th class=\"status\">Status</th>", "<th class=\"author\">Author</th>", "<th class=\"subject\">Subject</th>", + "<th class=\"status\">Sign</th>", "<th class=\"status\">Testbot</th>", "<th class=\"status\">Job ID</th></tr>\n"; @@ -130,7 +131,8 @@ foreach my $file (readdir DIR) { if (/^Subject: (.*)$/) { $patch{"subject"} = $1; } elsif (/^From: (.*)$/) { $patch{"author"} = format_author($1); } - last if (defined $patch{"subject"} && defined $patch{"author"}); + elsif (/^Signed-off-by: (.*)$/) { push @{$patch{"signoff"}}, format_author($1); } + last if (/^---$/); } close PATCH; @@ -148,6 +150,15 @@ foreach my $file (readdir DIR) $patch{"order"} = <ORDER>; close ORDER; } + if (open SIGNOFF, "<$dir/$file.signoff") + { + while (<SIGNOFF>) + { + chomp; + push @{$patch{"signoff"}}, format_author($_); + } + close SIGNOFF; + } $patch{"testbot"} = ""; $patch{"testjob"} = ""; $patch{"testurl"} = ""; @@ -182,6 +193,14 @@ foreach my $file (sort { $patches{$b}->{"order"} <=> $patches{$a}->{"order"} } k escapeHTML($patch->{"author"}); printf INDEX "<td class=\"subject\"><a href=\"data/$file\">%s</a></td>", escapeHTML($patch->{"subject"}); + if (defined($patch->{"signoff"})) + { + printf INDEX "<td class=\"checkmark\"><a title=\"%s\">✓</a></td>", join("\n",@{$patch->{"signoff"}}); + } + else + { + printf INDEX "<td></td>"; + } if ($patch->{"testbot"} eq "Failed") { print INDEX "<td class=\"testbot botfail\"><a href=\"data/$file.testfail\">Failed</a></td>";

1 0

Alexandre Julliard : patches: Add a new 'signoff' patch status.
by Alexandre Julliard Oct. 6, 2015

Oct. 6, 2015

Module: tools Branch: master Commit: 51d2ba45ef1e17b10a201d9d59484601bb049084 URL: http://source.winehq.org/git/tools.git/?a=commit;h=51d2ba45ef1e17b10a201d9d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 6 22:02:03 2015 +0900 patches: Add a new 'signoff' patch status. --- patches/expire | 1 + patches/patches.css | 1 + patches/update | 2 ++ 3 files changed, 4 insertions(+) diff --git a/patches/expire b/patches/expire index f143ab1..e092a71 100755 --- a/patches/expire +++ b/patches/expire @@ -37,6 +37,7 @@ my %status_expiry = "split" => 7, "depend" => 7, "sequence" => 7, + "signoff" => 1, "superseded" => 1, "testcase" => 7, "testfail" => 7, diff --git a/patches/patches.css b/patches/patches.css index 745ec75..b47d244 100644 --- a/patches/patches.css +++ b/patches/patches.css @@ -154,6 +154,7 @@ tr.odd { background-color: #f8e8e8; } .sequence, .sequence :link, .sequence :visited { color: #e08000; } .deferred, .deferred :link, .deferred :visited { color: #e08000; } .testcase, .testcase :link, .testcase :visited { color: #e08000; } +.signoff, .signoff :link, .signoff :visited { color: #e08000; } .other, .other :link, .other :visited { color: #e08000; } .applyfail, .applyfail :link, .applyfail :visited { color: red; } .buildfail, .buildfail :link, .buildfail :visited { color: red; } diff --git a/patches/update b/patches/update index 4ccc910..576b405 100755 --- a/patches/update +++ b/patches/update @@ -42,6 +42,7 @@ my %status_descr = "sequence" => "Bad sequence", "testcase" => "Needs tests", "testfail" => "Test failure", + "signoff" => "Sign-off", ); my @legend = @@ -57,6 +58,7 @@ my @legend = "<li>Someone else fixed the problem already.</li></ul>" ], [ "testcase", "<ul><li>You need to write some test cases demonstrating that the patch is correct.</li></ul>" ], [ "deferred", "<ul><li>The patch is deferred because of code freeze for an upcoming release. Either resend after the release, make the patch less intrusive, or make a convincing argument that it needs to be included in the release.</li></ul>" ], + [ "signoff", "<ul><li>This is a Signed-off-by reply to another patch.</li></ul>" ], [ "other", "<ul><li>The patch belongs to another WineHQ project (website, appdb, etc.) and will be applied by the respective maintainer.</li></ul>" ], [ "applyfail", "<ul><li>The patch got mangled in transit.</li>" . "<li>It's not relative to the latest git.</li>" .

1 0

Alexandre Julliard : patches: Preserve In-Reply-To and References headers.
by Alexandre Julliard Oct. 6, 2015

Oct. 6, 2015

Module: tools Branch: master Commit: 3bbee01ef47bb2934c0ce81ca72e704a2693424a URL: http://source.winehq.org/git/tools.git/?a=commit;h=3bbee01ef47bb2934c0ce81c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 6 18:18:05 2015 +0900 patches: Preserve In-Reply-To and References headers. --- patches/filter | 2 ++ 1 file changed, 2 insertions(+) diff --git a/patches/filter b/patches/filter index 53ea86e..62e2a0d 100755 --- a/patches/filter +++ b/patches/filter @@ -165,5 +165,7 @@ printf "From: %s\n", encode_utf8($message->Email::Simple::header("from") || "(un printf "Subject: %s\n", encode_utf8($message->Email::Simple::header("subject") || "(none)"); printf "Message-Id: %s\n", $message->header("message-id"); printf "Date: %s\n", $message->header("date"); +printf "In-Reply-To: %s\n", $message->header("in-reply-to") if $message->header("in-reply-to"); +printf "References: %s\n", $message->header("references") if $message->header("references"); print "\n"; print join("\n",decode_parts($message->parts)), "\n";

1 0

Alexandre Julliard : wine_release: Also register new version for the wine-staging product.
by Alexandre Julliard Oct. 6, 2015

Oct. 6, 2015

Module: tools Branch: master Commit: ab9c5ab1e03a4148050d91075e75a18e81f6b642 URL: http://source.winehq.org/git/tools.git/?a=commit;h=ab9c5ab1e03a4148050d9107… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Oct 3 22:14:50 2015 +0900 wine_release: Also register new version for the wine-staging product. --- wine_release | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wine_release b/wine_release index f6991cb..38d9e74 100755 --- a/wine_release +++ b/wine_release @@ -83,6 +83,6 @@ then fi # add version to bugzilla table -echo "INSERT INTO bugs.versions (value, product_id) VALUES(\"$version\",1)" | mysql +echo "INSERT INTO bugs.versions (value, product_id) VALUES(\"$version\",1),(\"$version\",7)" | mysql # end

1 0

Andrew Eikum : openal32: Prefer native version.
by Alexandre Julliard Oct. 5, 2015

Oct. 5, 2015

Module: wine Branch: master Commit: 7d6c6025923c039ac6a2458ca466290621238c36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d6c6025923c039ac6a2458ca… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Oct 2 09:02:56 2015 -0500 openal32: Prefer native version. Because openal contexts are global per-process, applications that use openal will conflict with Wine DLLs that use openal like xaudio2_7 now does. Windows does not ship an openal32, so all applications that use openal will ship their own copy of it. According to Chris Robinson, Windows native openal32 works fine in Wine, so we should just use that to avoid the problem. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/openal32/openal.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/openal32/openal.c b/dlls/openal32/openal.c index 5a4e1e7..cd49b92 100644 --- a/dlls/openal32/openal.c +++ b/dlls/openal32/openal.c @@ -99,6 +99,8 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) { switch(reason) { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hinst); #define LOADFUNC(x) x = alcGetProcAddress(NULL, #x)

1 0

Hans Leidekker : wininet: Set Content-Length header to zero if the verb is CONNECT.
by Alexandre Julliard Oct. 5, 2015

Oct. 5, 2015

Module: wine Branch: master Commit: d050343c502202e1abdabdb37668684031d5367d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d050343c502202e1abdabdb37… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Oct 2 15:06:36 2015 +0200 wininet: Set Content-Length header to zero if the verb is CONNECT. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wininet/http.c | 25 ++++++++++++++++++++----- dlls/wininet/tests/http.c | 26 ++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 5 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index edea9f8..143dc75 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -4877,6 +4877,16 @@ static char *build_ascii_request( const WCHAR *str, void *data, DWORD data_len, return ret; } +static void set_content_length_header( http_request_t *request, DWORD len, DWORD flags ) +{ + static const WCHAR fmtW[] = + {'C','o','n','t','e','n','t','-','L','e','n','g','t','h',':',' ','%','u','\r','\n',0}; + WCHAR buf[sizeof(fmtW)/sizeof(fmtW[0]) + 10]; + + sprintfW( buf, fmtW, len ); + HTTP_HttpAddRequestHeadersW( request, buf, ~0u, flags ); +} + /*********************************************************************** * HTTP_HttpSendRequestW (internal) * @@ -4891,12 +4901,9 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, DWORD dwHeaderLength, LPVOID lpOptional, DWORD dwOptionalLength, DWORD dwContentLength, BOOL bEndRequest) { - static const WCHAR szContentLength[] = - { 'C','o','n','t','e','n','t','-','L','e','n','g','t','h',':',' ','%','l','i','\r','\n',0 }; BOOL redirected = FALSE, secure_proxy_connect = FALSE, loop_next; LPWSTR requestString = NULL; INT responseLen, cnt; - WCHAR contentLengthStr[sizeof szContentLength/2 /* includes \r\n */ + 20 /* int */ ]; DWORD res; TRACE("--> %p\n", request); @@ -4912,8 +4919,7 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, if (dwContentLength || strcmpW(request->verb, szGET)) { - sprintfW(contentLengthStr, szContentLength, dwContentLength); - HTTP_HttpAddRequestHeadersW(request, contentLengthStr, -1L, HTTP_ADDREQ_FLAG_ADD_IF_NEW); + set_content_length_header(request, dwContentLength, HTTP_ADDREQ_FLAG_ADD_IF_NEW); request->bytesToWrite = dwContentLength; } if (request->session->appInfo->agent) @@ -5002,6 +5008,10 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, { static const WCHAR connectW[] = {'C','O','N','N','E','C','T',0}; const WCHAR *target = request->server->host_port; + + if (HTTP_GetCustomHeaderIndex(request, szContent_Length, 0, TRUE) >= 0) + set_content_length_header(request, 0, HTTP_ADDREQ_FLAG_REPLACE); + requestString = build_request_header(request, connectW, target, g_szHttp1_1, TRUE); } else if (request->proxy && !(request->hdr.dwFlags & INTERNET_FLAG_SECURE)) @@ -5011,7 +5021,12 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, heap_free(url); } else + { + if (request->proxy && HTTP_GetCustomHeaderIndex(request, szContent_Length, 0, TRUE) >= 0) + set_content_length_header(request, dwContentLength, HTTP_ADDREQ_FLAG_REPLACE); + requestString = build_request_header(request, request->verb, request->path, request->version, TRUE); + } TRACE("Request header -> %s\n", debugstr_w(requestString) ); diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 973413a..410865d 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -2106,6 +2106,13 @@ static DWORD CALLBACK server_thread(LPVOID param) else send(c, notokmsg, sizeof notokmsg-1, 0); } + if (strstr(buffer, "CONNECT ")) + { + if (!strstr(buffer, "Content-Length: 0")) + send(c, notokmsg, sizeof notokmsg-1, 0); + else + send(c, proxymsg, sizeof proxymsg-1, 0); + } if (strstr(buffer, "/test2")) { if (strstr(buffer, "Proxy-Authorization: Basic bWlrZToxMTAx")) @@ -2806,6 +2813,25 @@ static void test_proxy_direct(int port) ok(r, "HttpQueryInfo failed\n"); ok(!strcmp(buffer, "200"), "proxy code wrong\n"); + InternetCloseHandle(hr); + InternetCloseHandle(hc); + InternetCloseHandle(hi); + + sprintf(buffer, "localhost:%d\n", port); + hi = InternetOpenA("winetest", INTERNET_OPEN_TYPE_PROXY, buffer, NULL, 0); + ok(hi != NULL, "InternetOpen failed\n"); + + hc = InternetConnectA(hi, "test.winehq.org", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); + ok(hc != NULL, "InternetConnect failed\n"); + + hr = HttpOpenRequestA(hc, "POST", "/test2", NULL, NULL, NULL, INTERNET_FLAG_SECURE, 0); + ok(hr != NULL, "HttpOpenRequest failed\n"); + + r = HttpSendRequestA(hr, NULL, 0, (char *)"data", sizeof("data")); + ok(r, "HttpSendRequest failed %u\n", GetLastError()); + + test_status_code(hr, 407); + done: InternetCloseHandle(hr); InternetCloseHandle(hc);

1 0

André Hentschel : wineboot: Remove unused macro.
by Alexandre Julliard Oct. 5, 2015

Oct. 5, 2015

Module: wine Branch: master Commit: 645ffcbdd3921324634b8469ab33e510baf811a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=645ffcbdd3921324634b8469a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Oct 3 20:24:01 2015 +0200 wineboot: Remove unused macro. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- programs/wineboot/wineboot.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index cf0c741..1477287 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -85,8 +85,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(wineboot); -#define MAX_LINE_LENGTH (2*MAX_PATH+2) - extern BOOL shutdown_close_windows( BOOL force ); extern BOOL shutdown_all_desktops( BOOL force ); extern void kill_processes( BOOL kill_desktop );

1 0