December 2014 - Wine-commits

Michael Stefaniuc : mlang/tests: Avoid always true ok() checks (PVS-Studio ).
by Alexandre Julliard 22 Dec '14

22 Dec '14

Module: wine Branch: master Commit: ef8db24b9c77bdc110c4c2b6acb4581b9fd6d193 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef8db24b9c77bdc110c4c2b6a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 22 15:09:15 2014 +0100 mlang/tests: Avoid always true ok() checks (PVS-Studio). --- dlls/mlang/tests/mlang.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index a24dbbf..0078f6e 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -487,15 +487,15 @@ static void test_EnumCodePages(IMultiLanguage2 *iML2, DWORD flags) ok(ret == S_OK, "IEnumCodePage_Reset: expected S_OK, got %08x\n", ret); n = 65536; ret = IEnumCodePage_Next(iEnumCP, 0, NULL, &n); + ok(ret == S_FALSE || ret == E_FAIL, + "IEnumCodePage_Next: expected S_FALSE or E_FAIL, got %08x\n", ret); if (ret == S_FALSE) - ok(n == 0 && ret == S_FALSE, "IEnumCodePage_Next: expected 0/S_FALSE, got %u/%08x\n", n, ret); + ok(n == 0, "IEnumCodePage_Next: expected 0/S_FALSE, got %u/%08x\n", n, ret); else if (ret == E_FAIL) - ok(n == 65536 && ret == E_FAIL, "IEnumCodePage_Next: expected 65536/E_FAIL, got %u/%08x\n", n, ret); + ok(n == 65536, "IEnumCodePage_Next: expected 65536/E_FAIL, got %u/%08x\n", n, ret); ret = IEnumCodePage_Next(iEnumCP, 0, NULL, NULL); - if (ret == S_FALSE) - ok(ret == S_FALSE, "IEnumCodePage_Next: expected S_FALSE, got %08x\n", ret); - else if (ret == E_FAIL) - ok(n == 65536 && ret == E_FAIL, "IEnumCodePage_Next: expected 65536/E_FAIL, got %u/%08x\n", n, ret); + ok(ret == S_FALSE || ret == E_FAIL, + "IEnumCodePage_Next: expected S_FALSE or E_FAIL, got %08x\n", ret); cpinfo = HeapAlloc(GetProcessHeap(), 0, sizeof(*cpinfo) * total * 2);

1 0

Austin English : version: Add stubs for GetFileVersionInfoSizeExA/W.
by Alexandre Julliard 22 Dec '14

22 Dec '14

Module: wine Branch: master Commit: caaf6aafa96d1f8ac72f5e019c4c97ef3d1958e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=caaf6aafa96d1f8ac72f5e019… Author: Austin English <austinenglish(a)gmail.com> Date: Sat Dec 20 13:39:54 2014 -0600 version: Add stubs for GetFileVersionInfoSizeExA/W. --- .../api-ms-win-downlevel-version-l1-1-0.spec | 2 +- dlls/version/version.c | 20 ++++++++++++++++++++ dlls/version/version.spec | 2 ++ 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/api-ms-win-downlevel-version-l1-1-0/api-ms-win-downlevel-version-l1-1-0.spec b/dlls/api-ms-win-downlevel-version-l1-1-0/api-ms-win-downlevel-version-l1-1-0.spec index e99d8a0..46eac31 100644 --- a/dlls/api-ms-win-downlevel-version-l1-1-0/api-ms-win-downlevel-version-l1-1-0.spec +++ b/dlls/api-ms-win-downlevel-version-l1-1-0/api-ms-win-downlevel-version-l1-1-0.spec @@ -1,5 +1,5 @@ @ stub GetFileVersionInfoExW -@ stub GetFileVersionInfoSizeExW +@ stdcall GetFileVersionInfoSizeExW(long wstr ptr) version.GetFileVersionInfoSizeExW @ stdcall VerFindFileA(long str str str ptr ptr ptr ptr) version.VerFindFileA @ stdcall VerFindFileW(long wstr wstr wstr ptr ptr ptr ptr) version.VerFindFileW @ stdcall VerQueryValueA(ptr str ptr ptr) version.VerQueryValueA diff --git a/dlls/version/version.c b/dlls/version/version.c index 58fd029..121ed8f 100644 --- a/dlls/version/version.c +++ b/dlls/version/version.c @@ -1613,3 +1613,23 @@ DWORD WINAPI VerInstallFileW( HeapFree( GetProcessHeap(), 0, wcurd ); return ret; } + +/****************************************************************************** + * GetFileVersionInfoSizeExA [VERSION.@] + */ +DWORD WINAPI GetFileVersionInfoSizeExA(DWORD flags, LPCSTR filename, LPDWORD handle) +{ + FIXME("stub: %u %s %p\n", flags, wine_dbgstr_a(filename), handle); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} + +/****************************************************************************** + * GetFileVersionInfoSizeExW [VERSION.@] + */ +DWORD WINAPI GetFileVersionInfoSizeExW(DWORD flags, LPCWSTR filename, LPDWORD handle) +{ + FIXME("stub: %u %s %p\n", flags, wine_dbgstr_w(filename), handle); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} diff --git a/dlls/version/version.spec b/dlls/version/version.spec index 0bd9427..b512e48 100644 --- a/dlls/version/version.spec +++ b/dlls/version/version.spec @@ -1,6 +1,8 @@ @ stdcall GetFileVersionInfoA(str long long ptr) @ stdcall GetFileVersionInfoSizeA(str ptr) @ stdcall GetFileVersionInfoSizeW(wstr ptr) +@ stdcall GetFileVersionInfoSizeExA(long str ptr) +@ stdcall GetFileVersionInfoSizeExW(long wstr ptr) @ stdcall GetFileVersionInfoW(wstr long long ptr) @ stdcall VerFindFileA(long str str str ptr ptr ptr ptr) @ stdcall VerFindFileW(long wstr wstr wstr ptr ptr ptr ptr)

1 0

Jacek Caban : urlmon: Store URLs as const char* in mime_tests.
by Alexandre Julliard 22 Dec '14

22 Dec '14

Module: wine Branch: master Commit: 299a48075dd54a5ab8620c22c177d426aae1e99f URL: http://source.winehq.org/git/wine.git/?a=commit;h=299a48075dd54a5ab8620c22c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 22 19:10:19 2014 +0100 urlmon: Store URLs as const char* in mime_tests. --- dlls/urlmon/tests/misc.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index 287fce0..b0849a0 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -284,7 +284,6 @@ static void test_RegisterFormatEnumerator(void) IEnumFORMATETC_Release(format); IBindCtx_Release(bctx); } - static const WCHAR url1[] = {'r','e','s',':','/','/','m','s','h','t','m','l','.','d','l','l', '/','b','l','a','n','k','.','h','t','m',0}; static const WCHAR url2[] = {'i','n','d','e','x','.','h','t','m',0}; @@ -464,17 +463,17 @@ static void test_CoInternetQueryInfo(void) } static const struct { - const WCHAR *url; + const char *url; const char *mime; HRESULT hres; } mime_tests[] = { - {url1, "text/html", S_OK}, - {url2, "text/html", S_OK}, - {url3, "text/html", S_OK}, - {url4, NULL, E_FAIL}, - {url5, NULL, __HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)}, - {url6, NULL, E_FAIL}, - {url7, NULL, __HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)} + {"res://mshtml.dll/blank.htm", "text/html", S_OK}, + {"index.htm", "text/html", S_OK}, + {"file://c:\\Index.htm", "text/html", S_OK}, + {"file://some%20file%2ejpg", NULL, E_FAIL}, + {"http://www.winehq.org", NULL, __HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)}, + {"about:blank", NULL, E_FAIL}, + {"ftp://winehq.org/file.test", NULL, __HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)} }; static BYTE data1[] = "test data\n"; @@ -711,7 +710,8 @@ static void test_FindMimeFromData(void) for(i=0; i<sizeof(mime_tests)/sizeof(mime_tests[0]); i++) { mime = (LPWSTR)0xf0f0f0f0; - hres = pFindMimeFromData(NULL, mime_tests[i].url, NULL, 0, NULL, 0, &mime, 0); + url = a2w(mime_tests[i].url); + hres = pFindMimeFromData(NULL, url, NULL, 0, NULL, 0, &mime, 0); if(mime_tests[i].mime) { ok(hres == S_OK, "[%d] FindMimeFromData failed: %08x\n", i, hres); ok(!strcmp_wa(mime, mime_tests[i].mime), "[%d] wrong mime: %s\n", i, wine_dbgstr_w(mime)); @@ -724,16 +724,17 @@ static void test_FindMimeFromData(void) } mime = (LPWSTR)0xf0f0f0f0; - hres = pFindMimeFromData(NULL, mime_tests[i].url, NULL, 0, text_plainW, 0, &mime, 0); + hres = pFindMimeFromData(NULL, url, NULL, 0, text_plainW, 0, &mime, 0); ok(hres == S_OK, "[%d] FindMimeFromData failed: %08x\n", i, hres); ok(!strcmp_wa(mime, "text/plain"), "[%d] wrong mime: %s\n", i, wine_dbgstr_w(mime)); CoTaskMemFree(mime); mime = (LPWSTR)0xf0f0f0f0; - hres = pFindMimeFromData(NULL, mime_tests[i].url, NULL, 0, app_octet_streamW, 0, &mime, 0); + hres = pFindMimeFromData(NULL, url, NULL, 0, app_octet_streamW, 0, &mime, 0); ok(hres == S_OK, "[%d] FindMimeFromData failed: %08x\n", i, hres); ok(!strcmp_wa(mime, "application/octet-stream"), "[%d] wrong mime: %s\n", i, wine_dbgstr_w(mime)); CoTaskMemFree(mime); + heap_free(url); } for(i=0; i < sizeof(mime_tests2)/sizeof(mime_tests2[0]); i++) {

1 0

Jacek Caban : d3d11.idl: Added D3D11_APPEND_ALIGNED_ELEMENT declaration.
by Alexandre Julliard 22 Dec '14

22 Dec '14

Module: wine Branch: master Commit: f28c441673aed46bdc24f72b315f2002728691bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=f28c441673aed46bdc24f72b3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Dec 20 14:06:51 2014 +0100 d3d11.idl: Added D3D11_APPEND_ALIGNED_ELEMENT declaration. --- include/d3d11.idl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/d3d11.idl b/include/d3d11.idl index eef826f..e472944 100644 --- a/include/d3d11.idl +++ b/include/d3d11.idl @@ -445,6 +445,8 @@ typedef enum D3D11_INPUT_CLASSIFICATION D3D11_INPUT_PER_INSTANCE_DATA, } D3D11_INPUT_CLASSIFICATION; +const UINT D3D11_APPEND_ALIGNED_ELEMENT = 0xffffffff; + typedef struct D3D11_INPUT_ELEMENT_DESC { LPCSTR SemanticName;

1 0

Amine Khaldi : shdocvw: Fix inverted StopWatch forwards.
by Alexandre Julliard 22 Dec '14

22 Dec '14

Module: wine Branch: master Commit: 998d34648734430979f8e3396ee797f59617e26b URL: http://source.winehq.org/git/wine.git/?a=commit;h=998d34648734430979f8e3396… Author: Amine Khaldi <amine.khaldi(a)reactos.org> Date: Sat Dec 20 16:56:51 2014 +0100 shdocvw: Fix inverted StopWatch forwards. --- dlls/shdocvw/shdocvw_main.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/shdocvw/shdocvw_main.c b/dlls/shdocvw/shdocvw_main.c index 3ce5df1..2e5f2c9 100644 --- a/dlls/shdocvw/shdocvw_main.c +++ b/dlls/shdocvw/shdocvw_main.c @@ -317,12 +317,12 @@ void WINAPI StopWatchFlushFORWARD(void) } /****************************************************************** - * StopWatchWFORWARD (SHDOCVW.@) + * StopWatchAFORWARD (SHDOCVW.@) */ -DWORD WINAPI StopWatchWFORWARD(DWORD dwClass, LPCWSTR lpszStr, DWORD dwUnknown, +DWORD WINAPI StopWatchAFORWARD(DWORD dwClass, LPCSTR lpszStr, DWORD dwUnknown, DWORD dwMode, DWORD dwTimeStamp) { - static DWORD (WINAPI *p)(DWORD, LPCWSTR, DWORD, DWORD, DWORD); + static DWORD (WINAPI *p)(DWORD, LPCSTR, DWORD, DWORD, DWORD); if (p || (p = fetch_shlwapi_ordinal(243))) return p(dwClass, lpszStr, dwUnknown, dwMode, dwTimeStamp); @@ -330,12 +330,12 @@ DWORD WINAPI StopWatchWFORWARD(DWORD dwClass, LPCWSTR lpszStr, DWORD dwUnknown, } /****************************************************************** - * StopWatchAFORWARD (SHDOCVW.@) + * StopWatchWFORWARD (SHDOCVW.@) */ -DWORD WINAPI StopWatchAFORWARD(DWORD dwClass, LPCSTR lpszStr, DWORD dwUnknown, +DWORD WINAPI StopWatchWFORWARD(DWORD dwClass, LPCWSTR lpszStr, DWORD dwUnknown, DWORD dwMode, DWORD dwTimeStamp) { - static DWORD (WINAPI *p)(DWORD, LPCSTR, DWORD, DWORD, DWORD); + static DWORD (WINAPI *p)(DWORD, LPCWSTR, DWORD, DWORD, DWORD); if (p || (p = fetch_shlwapi_ordinal(244))) return p(dwClass, lpszStr, dwUnknown, dwMode, dwTimeStamp);

1 0

Jacek Caban : mshtml: Added IHTMLDOMTextNode::splitText implementation.
by Alexandre Julliard 22 Dec '14

22 Dec '14

Module: wine Branch: master Commit: b69550ab348941d16747f0af2492901622778908 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b69550ab348941d16747f0af2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Dec 21 16:32:48 2014 +0100 mshtml: Added IHTMLDOMTextNode::splitText implementation. --- dlls/mshtml/htmltextnode.c | 27 +++++++++++++++++++++++++-- dlls/mshtml/tests/jstest.html | 16 ++++++++++++++++ 2 files changed, 41 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmltextnode.c b/dlls/mshtml/htmltextnode.c index fd4795b..411123d 100644 --- a/dlls/mshtml/htmltextnode.c +++ b/dlls/mshtml/htmltextnode.c @@ -152,8 +152,31 @@ static HRESULT WINAPI HTMLDOMTextNode_get_length(IHTMLDOMTextNode *iface, LONG * static HRESULT WINAPI HTMLDOMTextNode_splitText(IHTMLDOMTextNode *iface, LONG offset, IHTMLDOMNode **pRetNode) { HTMLDOMTextNode *This = impl_from_IHTMLDOMTextNode(iface); - FIXME("(%p)->(%d %p)\n", This, offset, pRetNode); - return E_NOTIMPL; + HTMLDOMNode *node; + nsIDOMText *text; + nsresult nsres; + HRESULT hres; + + TRACE("(%p)->(%d %p)\n", This, offset, pRetNode); + + nsres = nsIDOMText_SplitText(This->nstext, offset, &text); + if(NS_FAILED(nsres)) { + ERR("SplitText failed: %x08x\n", nsres); + return E_FAIL; + } + + if(!text) { + *pRetNode = NULL; + return S_OK; + } + + hres = get_node(This->node.doc, (nsIDOMNode*)text, TRUE, &node); + nsIDOMText_Release(text); + if(FAILED(hres)) + return hres; + + *pRetNode = &node->IHTMLDOMNode_iface; + return S_OK; } static const IHTMLDOMTextNodeVtbl HTMLDOMTextNodeVtbl = { diff --git a/dlls/mshtml/tests/jstest.html b/dlls/mshtml/tests/jstest.html index 2b3634e..528c2e1 100644 --- a/dlls/mshtml/tests/jstest.html +++ b/dlls/mshtml/tests/jstest.html @@ -339,6 +339,21 @@ function test_language_attribute() { ok(elem.language === "1", "elem.language = " + elem.language); } +function test_text_node() { + document.body.innerHTML = 'testing text'; + var text = document.body.childNodes[0], text2; + ok(text.data == "testing text", "text.data = " + text.data); + + text2 = text.splitText(7); + ok(text.data == "testing", "text.data = " + text.data); + ok(text2.data == " text", "text2.data = " + text2.data); + ok(text.nextSibling === text2, "text.nextSibling !== text2"); + + text2 = text.splitText(0); + ok(text.data == "", "text.data = " + text.data); + ok(text2.data == "testing", "text2.data = " + text2.data); +} + var globalVar = false; function runTests() { @@ -363,6 +378,7 @@ function runTests() { test_customtag(); test_whitespace_nodes(); test_language_attribute(); + test_text_node(); var r = window.execScript("globalVar = true;"); ok(r === undefined, "execScript returned " + r);

1 0

Jacek Caban : mshtml: Include nsbody reference in cycle collection.
by Alexandre Julliard 22 Dec '14

22 Dec '14

Module: wine Branch: master Commit: 278daad3bdd202283ea29c0089c19613efbe8f70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=278daad3bdd202283ea29c008… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Dec 21 19:29:35 2014 +0100 mshtml: Include nsbody reference in cycle collection. --- dlls/mshtml/htmlbody.c | 30 +++++++++++++++++++++++++----- 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index 7117087..748302e 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -805,13 +805,23 @@ static HRESULT HTMLBodyElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) return HTMLElement_QI(&This->textcont.element.node, riid, ppv); } -static void HTMLBodyElement_destructor(HTMLDOMNode *iface) +static void HTMLBodyElement_traverse(HTMLDOMNode *iface, nsCycleCollectionTraversalCallback *cb) { HTMLBodyElement *This = impl_from_HTMLDOMNode(iface); - nsIDOMHTMLBodyElement_Release(This->nsbody); + if(This->nsbody) + note_cc_edge((nsISupports*)This->nsbody, "This->nsbody", cb); +} + +static void HTMLBodyElement_unlink(HTMLDOMNode *iface) +{ + HTMLBodyElement *This = impl_from_HTMLDOMNode(iface); - HTMLElement_destructor(&This->textcont.element.node); + if(This->nsbody) { + nsIDOMHTMLBodyElement *nsbody = This->nsbody; + This->nsbody = NULL; + nsIDOMHTMLBodyElement_Release(nsbody); + } } static event_target_t **HTMLBodyElement_get_event_target(HTMLDOMNode *iface) @@ -832,12 +842,22 @@ static const cpc_entry_t HTMLBodyElement_cpc[] = { static const NodeImplVtbl HTMLBodyElementImplVtbl = { HTMLBodyElement_QI, - HTMLBodyElement_destructor, + HTMLElement_destructor, HTMLBodyElement_cpc, HTMLElement_clone, HTMLElement_handle_event, HTMLElement_get_attr_col, - HTMLBodyElement_get_event_target + HTMLBodyElement_get_event_target, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + HTMLBodyElement_traverse, + HTMLBodyElement_unlink }; static const tid_t HTMLBodyElement_iface_tids[] = {

1 0

Andrew Eikum : dsound: Don't send notify events before played range.
by Alexandre Julliard 19 Dec '14

19 Dec '14

Module: wine Branch: master Commit: 29d1ccc7e22c4e00c6212b4b15831bf5dc2071cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=29d1ccc7e22c4e00c6212b4b1… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Dec 19 09:10:46 2014 -0600 dsound: Don't send notify events before played range. --- dlls/dsound/mixer.c | 18 +++++++++++------- dlls/dsound/tests/dsound.c | 5 +---- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index 8d6b379..0fae20e 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -223,16 +223,20 @@ void DSOUND_CheckEvent(const IDirectSoundBufferImpl *dsb, DWORD playpos, int len } } - TRACE("Not stopped: first notify: %u (%u), range: [%u,%u)\n", first, - dsb->notifies[check].dwOffset, playpos, (playpos + len) % dsb->buflen); + TRACE("Not stopped: first notify: %u (%u), left notify: %u (%u), range: [%u,%u)\n", + first, dsb->notifies[first].dwOffset, + left, dsb->notifies[left].dwOffset, + playpos, (playpos + len) % dsb->buflen); /* send notifications in range */ - for(check = left; check < dsb->nrofnotifies; ++check){ - if(dsb->notifies[check].dwOffset >= playpos + len) - break; + if(dsb->notifies[left].dwOffset >= playpos){ + for(check = left; check < dsb->nrofnotifies; ++check){ + if(dsb->notifies[check].dwOffset >= playpos + len) + break; - TRACE("Signalling %p (%u)\n", dsb->notifies[check].hEventNotify, dsb->notifies[check].dwOffset); - SetEvent(dsb->notifies[check].hEventNotify); + TRACE("Signalling %p (%u)\n", dsb->notifies[check].hEventNotify, dsb->notifies[check].dwOffset); + SetEvent(dsb->notifies[check].hEventNotify); + } } if(playpos + len > dsb->buflen){ diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c index 1df7ce4..e5a9110 100644 --- a/dlls/dsound/tests/dsound.c +++ b/dlls/dsound/tests/dsound.c @@ -1532,10 +1532,9 @@ static void test_notifications(LPGUID lpGuid) rc = IDirectSoundBuffer_QueryInterface(buf, &IID_IDirectSoundNotify, (void**)&buf_notif); ok(rc == DS_OK, "QueryInterface(IID_IDirectSoundNotify): %08x\n", rc); - /* create notifications at each end of the buffer */ notifies[0].dwOffset = 0; handles[0] = notifies[0].hEventNotify = CreateEventW(NULL, FALSE, FALSE, NULL); - notifies[1].dwOffset = bufdesc.dwBufferBytes - 1; + notifies[1].dwOffset = bufdesc.dwBufferBytes / 2; handles[1] = notifies[1].hEventNotify = CreateEventW(NULL, FALSE, FALSE, NULL); rc = IDirectSoundNotify_SetNotificationPositions(buf_notif, 2, notifies); @@ -1550,8 +1549,6 @@ static void test_notifications(LPGUID lpGuid) for(cycles = 0; cycles < 6 /* 1.5s */; ++cycles){ DWORD wait; - /* since the notifications are on opposite ends of the entire buffer, - * they should arrive well-ordered in an alternating sequence. */ wait = WaitForMultipleObjects(2, handles, FALSE, 1000); ok(wait <= WAIT_OBJECT_0 + 1 && wait - WAIT_OBJECT_0 == expect, "Got unexpected notification order or timeout: %u\n", wait);

1 0

Hans Leidekker : wininet: Use a helper function to remove request headers.
by Alexandre Julliard 19 Dec '14

19 Dec '14

Module: wine Branch: master Commit: de64feaa5ca6a4765bf1947f2eba66198b3c5451 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de64feaa5ca6a4765bf1947f2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 19 16:49:48 2014 +0100 wininet: Use a helper function to remove request headers. --- dlls/wininet/http.c | 36 ++++++++++++++---------------------- 1 file changed, 14 insertions(+), 22 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index b2a85c7..532b65a 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -424,6 +424,15 @@ static void reset_data_stream(http_request_t *req) req->read_chunked = req->read_gzip = FALSE; } +static void remove_header( http_request_t *request, const WCHAR *str, BOOL from_request ) +{ + int index; + EnterCriticalSection( &request->headers_section ); + index = HTTP_GetCustomHeaderIndex( request, str, 0, from_request ); + if (index != -1) HTTP_DeleteCustomHeader( request, index ); + LeaveCriticalSection( &request->headers_section ); +} + #ifdef HAVE_ZLIB typedef struct { @@ -550,7 +559,7 @@ static void wininet_zfree(voidpf opaque, voidpf address) static DWORD init_gzip_stream(http_request_t *req, BOOL is_gzip) { gzip_stream_t *gzip_stream; - int index, zres; + int zres; gzip_stream = heap_alloc_zero(sizeof(gzip_stream_t)); if(!gzip_stream) @@ -567,11 +576,7 @@ static DWORD init_gzip_stream(http_request_t *req, BOOL is_gzip) return ERROR_OUTOFMEMORY; } - EnterCriticalSection( &req->headers_section ); - index = HTTP_GetCustomHeaderIndex(req, szContent_Length, 0, FALSE); - if(index != -1) - HTTP_DeleteCustomHeader(req, index); - LeaveCriticalSection( &req->headers_section ); + remove_header(req, szContent_Length, FALSE); if(req->read_size) { memcpy(gzip_stream->buf, req->read_buf+req->read_pos, req->read_size); @@ -4107,7 +4112,6 @@ static DWORD HTTP_HandleRedirect(http_request_t *request, LPCWSTR lpszUrl) { http_session_t *session = request->session; WCHAR path[INTERNET_MAX_PATH_LENGTH]; - int index; if(lpszUrl[0]=='/') { @@ -4214,15 +4218,9 @@ static DWORD HTTP_HandleRedirect(http_request_t *request, LPCWSTR lpszUrl) } } - EnterCriticalSection( &request->headers_section ); - /* Remove custom content-type/length headers on redirects. */ - index = HTTP_GetCustomHeaderIndex(request, szContent_Type, 0, TRUE); - if (index != -1) HTTP_DeleteCustomHeader(request, index); - index = HTTP_GetCustomHeaderIndex(request, szContent_Length, 0, TRUE); - if (index != -1) HTTP_DeleteCustomHeader(request, index); - - LeaveCriticalSection( &request->headers_section ); + remove_header(request, szContent_Type, TRUE); + remove_header(request, szContent_Length, TRUE); return ERROR_SUCCESS; } @@ -5185,8 +5183,6 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, } if (secure_proxy_connect && request->status_code == HTTP_STATUS_OK) { - int index; - res = NETCON_secure_connect(request->netconn, request->server); if (res != ERROR_SUCCESS) { @@ -5194,11 +5190,7 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, http_release_netconn( request, FALSE ); break; } - EnterCriticalSection( &request->headers_section ); - index = HTTP_GetCustomHeaderIndex(request, szProxy_Authorization, 0, TRUE); - if (index != -1) HTTP_DeleteCustomHeader(request, index); - LeaveCriticalSection( &request->headers_section ); - + remove_header(request, szProxy_Authorization, TRUE); destroy_authinfo(request->proxyAuthInfo); request->proxyAuthInfo = NULL;

1 0

Hans Leidekker : wininet/tests: Add a test to show that the Content-Length header is not updated when a request is reused.
by Alexandre Julliard 19 Dec '14

19 Dec '14

Module: wine Branch: master Commit: 3d9ba21d2f2dd9666eaca11cef706401789ac537 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d9ba21d2f2dd9666eaca11ce… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 19 16:50:17 2014 +0100 wininet/tests: Add a test to show that the Content-Length header is not updated when a request is reused. --- dlls/wininet/tests/http.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 98c8d62..92a6b8d 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -2290,6 +2290,28 @@ static DWORD CALLBACK server_thread(LPVOID param) else if (strstr(buffer, "Cache-Control: no-cache\r\n")) send(c, okmsg, sizeof(okmsg)-1, 0); else send(c, notokmsg, sizeof(notokmsg)-1, 0); } + if (strstr(buffer, "/test_request_content_length")) + { + static char msg[] = "HTTP/1.1 200 OK\r\nConnection: Keep-Alive\r\n\r\n"; + static int seen_content_length; + + if (!seen_content_length) + { + if (strstr(buffer, "Content-Length: 0")) + { + seen_content_length = 1; + send(c, msg, sizeof msg-1, 0); + } + else send(c, notokmsg, sizeof notokmsg-1, 0); + WaitForSingleObject(hCompleteEvent, 5000); + } + else + { + if (strstr(buffer, "Content-Length: 0")) send(c, msg, sizeof msg-1, 0); + else send(c, notokmsg, sizeof notokmsg-1, 0); + WaitForSingleObject(hCompleteEvent, 5000); + } + } if (strstr(buffer, "GET /test_premature_disconnect")) trace("closing connection\n"); @@ -4111,6 +4133,42 @@ static void test_cache_control_verb(int port) InternetCloseHandle(session); } +static void test_request_content_length(int port) +{ + char data[] = {'t','e','s','t'}; + HINTERNET ses, con, req; + BOOL ret; + + hCompleteEvent = CreateEventW(NULL, FALSE, FALSE, NULL); + + ses = InternetOpenA("winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); + ok(ses != NULL, "InternetOpen failed\n"); + + con = InternetConnectA(ses, "localhost", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); + ok(con != NULL, "InternetConnect failed\n"); + + req = HttpOpenRequestA(con, "POST", "/test_request_content_length", NULL, NULL, NULL, + INTERNET_FLAG_KEEP_CONNECTION, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + ret = HttpSendRequestA(req, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed %u\n", GetLastError()); + test_status_code(req, 200); + + SetEvent(hCompleteEvent); + + ret = HttpSendRequestA(req, NULL, 0, data, sizeof(data)); + ok(ret, "HttpSendRequest failed %u\n", GetLastError()); + test_status_code(req, 200); + + SetEvent(hCompleteEvent); + + InternetCloseHandle(req); + InternetCloseHandle(con); + InternetCloseHandle(ses); + CloseHandle(hCompleteEvent); +} + static void test_http_connection(void) { struct server_info si; @@ -4156,6 +4214,7 @@ static void test_http_connection(void) test_cache_control_verb(si.port); test_successive_HttpSendRequest(si.port); test_head_request(si.port); + test_request_content_length(si.port); /* send the basic request again to shutdown the server thread */ test_basic_request(si.port, "GET", "/quit");

1 0