January 2011 - Wine-Commits

Alexandre Julliard : ole32: Cleanup return value handling in CoWaitForMultipleHandles.
by Alexandre Julliard Jan. 21, 2011

Jan. 21, 2011

Module: wine Branch: master Commit: 8c2a9414a6517149f7b606091bbd2fcb4adcef05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c2a9414a6517149f7b606091… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 21 14:51:37 2011 +0100 ole32: Cleanup return value handling in CoWaitForMultipleHandles. --- dlls/ole32/compobj.c | 23 +++++++---------------- 1 files changed, 7 insertions(+), 16 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 5dadb18..a637439 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -3646,28 +3646,19 @@ HRESULT WINAPI CoWaitForMultipleHandles(DWORD dwFlags, DWORD dwTimeout, (dwFlags & COWAIT_ALERTABLE) ? TRUE : FALSE); } - if (res < WAIT_OBJECT_0 + cHandles) - { - /* handle signaled, store index */ - *lpdwindex = (res - WAIT_OBJECT_0); - break; - } - else if (res == WAIT_TIMEOUT) + switch (res) { + case WAIT_TIMEOUT: hr = RPC_S_CALLPENDING; break; - } - else if (res == WAIT_IO_COMPLETION) - { - *lpdwindex = WAIT_IO_COMPLETION; + case WAIT_FAILED: + hr = HRESULT_FROM_WIN32( GetLastError() ); break; - } - else - { - ERR("Unexpected wait termination: %d, %d\n", res, GetLastError()); - hr = E_UNEXPECTED; + default: + *lpdwindex = res; break; } + break; } TRACE("-- 0x%08x\n", hr); return hr;

1 0

Maarten Lankhorst : ole32: Handle alertable wait in CoWaitForMultipleHandles.
by Alexandre Julliard Jan. 21, 2011

Jan. 21, 2011

Module: wine Branch: master Commit: 75801f095db38c5c1dfecbd8d70ad14994484b56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75801f095db38c5c1dfecbd8d… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Jan 21 14:17:22 2011 +0100 ole32: Handle alertable wait in CoWaitForMultipleHandles. --- dlls/ole32/compobj.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index ad338bd..5dadb18 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -3657,6 +3657,11 @@ HRESULT WINAPI CoWaitForMultipleHandles(DWORD dwFlags, DWORD dwTimeout, hr = RPC_S_CALLPENDING; break; } + else if (res == WAIT_IO_COMPLETION) + { + *lpdwindex = WAIT_IO_COMPLETION; + break; + } else { ERR("Unexpected wait termination: %d, %d\n", res, GetLastError());

1 0

Jacek Caban : mshtml: Fixed leaks in htmllocation tests (valgrind).
by Alexandre Julliard Jan. 21, 2011

Jan. 21, 2011

Module: wine Branch: master Commit: f712c118e7c61f4a6d47d36d556f7faca03106b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f712c118e7c61f4a6d47d36d5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 21 14:16:20 2011 +0100 mshtml: Fixed leaks in htmllocation tests (valgrind). --- dlls/mshtml/tests/htmllocation.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/htmllocation.c b/dlls/mshtml/tests/htmllocation.c index 7de9a94..ebdb056 100644 --- a/dlls/mshtml/tests/htmllocation.c +++ b/dlls/mshtml/tests/htmllocation.c @@ -131,6 +131,7 @@ static void test_href(IHTMLLocation *loc, const struct location_test *test) ok(str_eq_wa(str, test->href), "%s: expected retrieved href to be L\"%s\", was: %s\n", test->name, test->href, wine_dbgstr_w(str)); + SysFreeString(str); } static void test_protocol(IHTMLLocation *loc, const struct location_test *test) @@ -149,6 +150,7 @@ static void test_protocol(IHTMLLocation *loc, const struct location_test *test) ok(str_eq_wa(str, test->protocol), "%s: expected retrieved protocol to be L\"%s\", was: %s\n", test->name, test->protocol, wine_dbgstr_w(str)); + SysFreeString(str); } static void test_host(IHTMLLocation *loc, const struct location_test *test) @@ -167,6 +169,7 @@ static void test_host(IHTMLLocation *loc, const struct location_test *test) ok(str_eq_wa(str, test->host), "%s: expected retrieved host to be L\"%s\", was: %s\n", test->name, test->host, wine_dbgstr_w(str)); + SysFreeString(str); } static void test_hostname(IHTMLLocation *loc, const struct location_test *test) @@ -185,6 +188,7 @@ static void test_hostname(IHTMLLocation *loc, const struct location_test *test) ok(str_eq_wa(str, test->hostname), "%s: expected retrieved hostname to be L\"%s\", was: %s\n", test->name, test->hostname, wine_dbgstr_w(str)); + SysFreeString(str); } static void test_port(IHTMLLocation *loc, const struct location_test *test) @@ -203,6 +207,7 @@ static void test_port(IHTMLLocation *loc, const struct location_test *test) ok(str_eq_wa(str, test->port), "%s: expected retrieved port to be L\"%s\", was: %s\n", test->name, test->port, wine_dbgstr_w(str)); + SysFreeString(str); } static void test_pathname(IHTMLLocation *loc, const struct location_test *test) @@ -221,6 +226,7 @@ static void test_pathname(IHTMLLocation *loc, const struct location_test *test) ok(str_eq_wa(str, test->pathname), "%s: expected retrieved pathname to be L\"%s\", was: %s\n", test->name, test->pathname, wine_dbgstr_w(str)); + SysFreeString(str); } static void test_search(IHTMLLocation *loc, const struct location_test *test) @@ -239,6 +245,7 @@ static void test_search(IHTMLLocation *loc, const struct location_test *test) ok(str_eq_wa(str, test->search), "%s: expected retrieved search to be L\"%s\", was: %s\n", test->name, test->search, wine_dbgstr_w(str)); + SysFreeString(str); } static void test_hash(IHTMLLocation *loc, const struct location_test *test) @@ -257,6 +264,7 @@ static void test_hash(IHTMLLocation *loc, const struct location_test *test) ok(str_eq_wa(str, test->hash), "%s: expected retrieved hash to be L\"%s\", was: %s\n", test->name, test->hash, wine_dbgstr_w(str)); + SysFreeString(str); } static void perform_test(const struct location_test* test)

1 0

Andrew Nguyen : windowscodecs: Use memmove in StreamOnMemory:: Read and StreamOnMemory:: Write to cope with potentially overlapped memory copying.
by Alexandre Julliard Jan. 21, 2011

Jan. 21, 2011

Module: wine Branch: master Commit: ae1e5b79fa9a92108e251875cc724de7740a3210 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae1e5b79fa9a92108e251875c… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Fri Jan 21 05:03:19 2011 -0600 windowscodecs: Use memmove in StreamOnMemory::Read and StreamOnMemory::Write to cope with potentially overlapped memory copying. Spotted with Valgrind. --- dlls/windowscodecs/stream.c | 4 +- dlls/windowscodecs/tests/stream.c | 50 ++++++++++++++++++++++++++++++++++++- 2 files changed, 51 insertions(+), 3 deletions(-) diff --git a/dlls/windowscodecs/stream.c b/dlls/windowscodecs/stream.c index 561719d..1ed08f3 100644 --- a/dlls/windowscodecs/stream.c +++ b/dlls/windowscodecs/stream.c @@ -108,7 +108,7 @@ static HRESULT WINAPI StreamOnMemory_Read(IStream *iface, EnterCriticalSection(&This->lock); uBytesRead = min(cb, This->dwMemsize - This->dwCurPos); - memcpy(pv, This->pbMemory + This->dwCurPos, uBytesRead); + memmove(pv, This->pbMemory + This->dwCurPos, uBytesRead); This->dwCurPos += uBytesRead; LeaveCriticalSection(&This->lock); @@ -131,7 +131,7 @@ static HRESULT WINAPI StreamOnMemory_Write(IStream *iface, hr = STG_E_MEDIUMFULL; } else { - memcpy(This->pbMemory + This->dwCurPos, pv, cb); + memmove(This->pbMemory + This->dwCurPos, pv, cb); This->dwCurPos += cb; hr = S_OK; if (pcbWritten) *pcbWritten = cb; diff --git a/dlls/windowscodecs/tests/stream.c b/dlls/windowscodecs/tests/stream.c index d5b2918..a55b898 100644 --- a/dlls/windowscodecs/tests/stream.c +++ b/dlls/windowscodecs/tests/stream.c @@ -31,8 +31,15 @@ static void test_StreamOnMemory(void) 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f, }; + const BYTE CmpMemOverlap[] = { + 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, + 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, + 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f, + 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f, + }; + const BYTE ZeroMem[10] = {0}; BYTE Memory[64], MemBuf[64]; - LARGE_INTEGER LargeNull, LargeInt; + LARGE_INTEGER LargeNull, LargeInt, SeekPos; ULARGE_INTEGER uLargeNull, uNewPos; ULONG uBytesRead, uBytesWritten; HRESULT hr; @@ -40,6 +47,7 @@ static void test_StreamOnMemory(void) LargeNull.QuadPart = 0; uLargeNull.QuadPart = 0; + SeekPos.QuadPart = 5; memcpy(Memory, CmpMem, sizeof(CmpMem)); @@ -76,6 +84,19 @@ static void test_StreamOnMemory(void) hr = IWICStream_InitializeFromMemory(pStream, Memory, sizeof(Memory)); ok(hr == S_OK, "InitializeFromMemory returned with %#x, expected %#x\n", hr, S_OK); + /* IWICStream does not maintain an independent copy of the backing memory buffer. */ + memcpy(Memory, ZeroMem, sizeof(ZeroMem)); + hr = IWICStream_Read(pStream, MemBuf, sizeof(ZeroMem), &uBytesRead); + ok(hr == S_OK, "Read returned with %#x, expected %#x\n", hr, S_OK); + if(SUCCEEDED(hr)) { + ok(uBytesRead == sizeof(ZeroMem), "Read %u bytes\n", uBytesRead); + ok(memcmp(MemBuf, ZeroMem, sizeof(ZeroMem)) == 0, "Read returned invalid data!\n"); + } + + IWICStream_Seek(pStream, LargeNull, STREAM_SEEK_SET, NULL); + + hr = IWICStream_Write(pStream, CmpMem, sizeof(CmpMem), &uBytesWritten); + ok(hr == S_OK, "Read returned with %#x, expected %#x\n", hr, S_OK); /* Seek */ hr = IWICStream_Seek(pStream, LargeNull, STREAM_SEEK_SET, &uNewPos); @@ -152,6 +173,17 @@ static void test_StreamOnMemory(void) ok(memcmp(Memory, CmpMem, uBytesRead) == 0, "Read returned invalid data!\n"); } + IWICStream_Seek(pStream, SeekPos, STREAM_SEEK_SET, NULL); + + hr = IWICStream_Read(pStream, Memory, 10, &uBytesRead); /* source and dest overlap */ + ok(hr == S_OK, "Read returned with %#x, expected %#x\n", hr, S_OK); + if(SUCCEEDED(hr)) { + ok(uBytesRead == 10, "Read %u bytes, expected %u\n", uBytesRead, 10); + ok(memcmp(Memory, CmpMemOverlap, uBytesRead) == 0, "Read returned invalid data!\n"); + } + + memcpy(Memory, CmpMem, sizeof(CmpMem)); + IWICStream_Seek(pStream, LargeNull, STREAM_SEEK_SET, NULL); hr = IWICStream_Read(pStream, Memory, sizeof(Memory) + 10, &uBytesRead); /* request too many bytes */ @@ -206,6 +238,22 @@ static void test_StreamOnMemory(void) hr = IWICStream_Write(pStream, MemBuf, 0, &uBytesWritten); ok(hr == S_OK, "Read returned with %#x, expected %#x\n", hr, S_OK); + /* Restore the original contents of the memory stream. */ + hr = IWICStream_Write(pStream, CmpMem, sizeof(CmpMem), &uBytesWritten); + ok(hr == S_OK, "Read returned with %#x, expected %#x\n", hr, S_OK); + + IWICStream_Seek(pStream, LargeNull, STREAM_SEEK_SET, NULL); + + /* Source and destination overlap. */ + hr = IWICStream_Write(pStream, Memory + 5, 10, &uBytesWritten); + ok(hr == S_OK, "Write returned with %#x, expected %#x\n", hr, S_OK); + if(SUCCEEDED(hr)) { + ok(uBytesWritten == 10, "Wrote %u bytes, expected %u\n", uBytesWritten, 10); + ok(memcmp(CmpMemOverlap, Memory, sizeof(CmpMemOverlap)) == 0, "Wrote returned invalid data!\n"); + } + + IWICStream_Seek(pStream, LargeNull, STREAM_SEEK_SET, NULL); + uBytesWritten = 0xdeadbeef; hr = IWICStream_Write(pStream, NULL, 3, &uBytesWritten); ok(hr == E_INVALIDARG, "Write returned with %#x, expected %#x\n", hr, E_INVALIDARG);

1 0

Alexander Morozov : shell32: Implement IDispatch methods of IShellDispatch.
by Alexandre Julliard Jan. 21, 2011

Jan. 21, 2011

Module: wine Branch: master Commit: 692437f556ba8744c768a8fc196c039b2b5f0203 URL: http://source.winehq.org/git/wine.git/?a=commit;h=692437f556ba8744c768a8fc1… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Thu Jan 20 15:55:48 2011 +0300 shell32: Implement IDispatch methods of IShellDispatch. --- dlls/shell32/shelldispatch.c | 58 +++++++++++++++++++++++++++++++++++------ 1 files changed, 49 insertions(+), 9 deletions(-) diff --git a/dlls/shell32/shelldispatch.c b/dlls/shell32/shelldispatch.c index 8d71395..9b2422b 100644 --- a/dlls/shell32/shelldispatch.c +++ b/dlls/shell32/shelldispatch.c @@ -39,6 +39,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); typedef struct { IShellDispatch IShellDispatch_iface; LONG ref; + ITypeInfo *iTypeInfo; } ShellDispatch; static inline ShellDispatch *impl_from_IShellDispatch(IShellDispatch *iface) @@ -46,6 +47,26 @@ static inline ShellDispatch *impl_from_IShellDispatch(IShellDispatch *iface) return CONTAINING_RECORD(iface, ShellDispatch, IShellDispatch_iface); } +static HRESULT load_type_info(REFGUID guid, ITypeInfo **pptinfo) +{ + ITypeLib *typelib; + HRESULT ret; + + ret = LoadRegTypeLib(&LIBID_Shell32, 1, 0, LOCALE_SYSTEM_DEFAULT, &typelib); + if (FAILED(ret)) + { + ERR("LoadRegTypeLib failed: %08x\n", ret); + return ret; + } + + ret = ITypeLib_GetTypeInfoOfGuid(typelib, guid, pptinfo); + ITypeLib_Release(typelib); + if (FAILED(ret)) + ERR("failed to load ITypeInfo\n"); + + return ret; +} + static HRESULT WINAPI ShellDispatch_QueryInterface(IShellDispatch *iface, REFIID riid, LPVOID *ppv) { @@ -87,34 +108,43 @@ static ULONG WINAPI ShellDispatch_Release(IShellDispatch *iface) TRACE("(%p), new refcount=%i\n", iface, ref); if (!ref) + { + ITypeInfo_Release(This->iTypeInfo); HeapFree(GetProcessHeap(), 0, This); + } return ref; } static HRESULT WINAPI ShellDispatch_GetTypeInfoCount(IShellDispatch *iface, UINT *pctinfo) { - FIXME("(%p,%p)\n", iface, pctinfo); + TRACE("(%p,%p)\n", iface, pctinfo); - return E_NOTIMPL; + *pctinfo = 1; + return S_OK; } static HRESULT WINAPI ShellDispatch_GetTypeInfo(IShellDispatch *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { - FIXME("(%p,%u,%d,%p)\n", iface, iTInfo, lcid, ppTInfo); + ShellDispatch *This = impl_from_IShellDispatch(iface); - *ppTInfo = NULL; - return E_NOTIMPL; + TRACE("(%p,%u,%d,%p)\n", iface, iTInfo, lcid, ppTInfo); + + ITypeInfo_AddRef(This->iTypeInfo); + *ppTInfo = This->iTypeInfo; + return S_OK; } static HRESULT WINAPI ShellDispatch_GetIDsOfNames(IShellDispatch *iface, REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) { - FIXME("(%p,%p,%p,%u,%d,%p)\n", iface, riid, rgszNames, cNames, lcid, + ShellDispatch *This = impl_from_IShellDispatch(iface); + + TRACE("(%p,%p,%p,%u,%d,%p)\n", iface, riid, rgszNames, cNames, lcid, rgDispId); - return E_NOTIMPL; + return ITypeInfo_GetIDsOfNames(This->iTypeInfo, rgszNames, cNames, rgDispId); } static HRESULT WINAPI ShellDispatch_Invoke(IShellDispatch *iface, @@ -122,10 +152,13 @@ static HRESULT WINAPI ShellDispatch_Invoke(IShellDispatch *iface, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { - FIXME("(%p,%d,%p,%d,%u,%p,%p,%p,%p)\n", iface, dispIdMember, riid, lcid, + ShellDispatch *This = impl_from_IShellDispatch(iface); + + TRACE("(%p,%d,%p,%d,%u,%p,%p,%p,%p)\n", iface, dispIdMember, riid, lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); - return E_NOTIMPL; + return ITypeInfo_Invoke(This->iTypeInfo, This, dispIdMember, wFlags, + pDispParams, pVarResult, pExcepInfo, puArgErr); } static HRESULT WINAPI ShellDispatch_get_Application(IShellDispatch *iface, @@ -350,6 +383,13 @@ HRESULT WINAPI IShellDispatch_Constructor(IUnknown *pUnkOuter, REFIID riid, This->IShellDispatch_iface.lpVtbl = &ShellDispatch_Vtbl; This->ref = 1; + ret = load_type_info(&IID_IShellDispatch, &This->iTypeInfo); + if (FAILED(ret)) + { + HeapFree(GetProcessHeap(), 0, This); + return ret; + } + ret = ShellDispatch_QueryInterface(&This->IShellDispatch_iface, riid, ppv); ShellDispatch_Release(&This->IShellDispatch_iface); return ret;

1 0

Greg Geldorp : wininet/tests: Fix failures when connecting through proxy.
by Alexandre Julliard Jan. 21, 2011

Jan. 21, 2011

Module: wine Branch: master Commit: 859be0a283757020e0fd3bb6f44973d984d131e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=859be0a283757020e0fd3bb6f… Author: Greg Geldorp <ggeldorp(a)vmware.com> Date: Fri Jan 21 13:35:40 2011 +0100 wininet/tests: Fix failures when connecting through proxy. --- dlls/wininet/tests/http.c | 54 +++++++++++++++++++++++++++++++++++---------- 1 files changed, 42 insertions(+), 12 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 2b0092a..8b4da71 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -151,6 +151,24 @@ static const test_data_t test_data[] = { static INTERNET_STATUS_CALLBACK (WINAPI *pInternetSetStatusCallbackA)(HINTERNET ,INTERNET_STATUS_CALLBACK); +static BOOL proxy_active(void) +{ + HKEY internet_settings; + DWORD proxy_enable; + DWORD size; + + if (RegOpenKeyExA(HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings", + 0, KEY_QUERY_VALUE, &internet_settings) != ERROR_SUCCESS) + return FALSE; + + size = sizeof(DWORD); + if (RegQueryValueExA(internet_settings, "ProxyEnable", NULL, NULL, (LPBYTE) &proxy_enable, &size) != ERROR_SUCCESS) + proxy_enable = 0; + + RegCloseKey(internet_settings); + + return proxy_enable != 0; +} static VOID WINAPI callback( HINTERNET hInternet, @@ -424,8 +442,16 @@ static void InternetReadFile_test(int flags, const test_data_t *test) } if (first_connection_to_test_url) { - CHECK_NOTIFIED(INTERNET_STATUS_RESOLVING_NAME); - CHECK_NOTIFIED(INTERNET_STATUS_NAME_RESOLVED); + if (! proxy_active()) + { + CHECK_NOTIFIED(INTERNET_STATUS_RESOLVING_NAME); + CHECK_NOTIFIED(INTERNET_STATUS_NAME_RESOLVED); + } + else + { + CLEAR_NOTIFIED(INTERNET_STATUS_RESOLVING_NAME); + CLEAR_NOTIFIED(INTERNET_STATUS_NAME_RESOLVED); + } } else todo_wine { @@ -638,8 +664,10 @@ static void InternetReadFile_chunked_test(void) res = HttpQueryInfoA(hor,HTTP_QUERY_TRANSFER_ENCODING,buffer,&length,0x0); buffer[length]=0; trace("Option TRANSFER_ENCODING -> %i %s\n",res,buffer); - ok( res, "Failed to get TRANSFER_ENCODING option, error %u\n", GetLastError() ); - ok( !strcmp( buffer, "chunked" ), "Wrong transfer encoding '%s'\n", buffer ); + ok( res || ( proxy_active() && GetLastError() == ERROR_HTTP_HEADER_NOT_FOUND ), + "Failed to get TRANSFER_ENCODING option, error %u\n", GetLastError() ); + ok( !strcmp( buffer, "chunked" ) || ( ! res && proxy_active() && GetLastError() == ERROR_HTTP_HEADER_NOT_FOUND ), + "Wrong transfer encoding '%s'\n", buffer ); SetLastError( 0xdeadbeef ); length = 16; @@ -1048,7 +1076,7 @@ static void HttpSendRequestEx_test(void) szBuffer[dwBytesRead] = 0; ok(dwBytesRead == 13,"Read %u bytes instead of 13\n",dwBytesRead); - ok(strncmp(szBuffer,"mode => Test\n",dwBytesRead)==0,"Got string %s\n",szBuffer); + ok(strncmp(szBuffer,"mode => Test\n",dwBytesRead)==0 || broken(proxy_active()),"Got string %s\n",szBuffer); ok(InternetCloseHandle(hRequest), "Close request handle failed\n"); done: @@ -2613,7 +2641,7 @@ static void test_secure_connection(void) INTERNET_CERTIFICATE_INFOW *certificate_structW = NULL; BOOL ret; - ses = InternetOpen("Gizmo5", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); + ses = InternetOpen("Gizmo5", INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, 0); ok(ses != NULL, "InternetOpen failed\n"); con = InternetConnect(ses, "testbot.winehq.org", @@ -2697,7 +2725,7 @@ static void test_secure_connection(void) InternetCloseHandle(ses); /* Repeating the tests with the W functions has the same result: */ - ses = InternetOpenW(gizmo5, INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); + ses = InternetOpenW(gizmo5, INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, 0); ok(ses != NULL, "InternetOpen failed\n"); con = InternetConnectW(ses, testbot, @@ -2788,7 +2816,7 @@ static void test_user_agent_header(void) char buffer[64]; BOOL ret; - ses = InternetOpen("Gizmo5", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); + ses = InternetOpen("Gizmo5", INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, 0); ok(ses != NULL, "InternetOpen failed\n"); con = InternetConnect(ses, "test.winehq.org", 80, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); @@ -3040,8 +3068,8 @@ static const struct notification async_send_request_ex_test[] = { internet_connect, INTERNET_STATUS_HANDLE_CREATED, 0 }, { http_open_request, INTERNET_STATUS_HANDLE_CREATED, 0 }, { http_send_request_ex, INTERNET_STATUS_DETECTING_PROXY, 1, 0, 1 }, - { http_send_request_ex, INTERNET_STATUS_RESOLVING_NAME, 1 }, - { http_send_request_ex, INTERNET_STATUS_NAME_RESOLVED, 1 }, + { http_send_request_ex, INTERNET_STATUS_RESOLVING_NAME, 1, 0, 1 }, + { http_send_request_ex, INTERNET_STATUS_NAME_RESOLVED, 1, 0, 1 }, { http_send_request_ex, INTERNET_STATUS_CONNECTING_TO_SERVER, 1 }, { http_send_request_ex, INTERNET_STATUS_CONNECTED_TO_SERVER, 1 }, { http_send_request_ex, INTERNET_STATUS_SENDING_REQUEST, 1 }, @@ -3052,8 +3080,10 @@ static const struct notification async_send_request_ex_test[] = { http_end_request, INTERNET_STATUS_RECEIVING_RESPONSE, 1 }, { http_end_request, INTERNET_STATUS_RESPONSE_RECEIVED, 1 }, { http_end_request, INTERNET_STATUS_REQUEST_COMPLETE, 1 }, - { internet_close_handle, INTERNET_STATUS_HANDLE_CLOSING, 0, 1 }, - { internet_close_handle, INTERNET_STATUS_HANDLE_CLOSING, 0, 1 } + { internet_close_handle, INTERNET_STATUS_CLOSING_CONNECTION, 0, 0, 1 }, + { internet_close_handle, INTERNET_STATUS_CONNECTION_CLOSED, 0, 0, 1 }, + { internet_close_handle, INTERNET_STATUS_HANDLE_CLOSING, 0, }, + { internet_close_handle, INTERNET_STATUS_HANDLE_CLOSING, 0, } }; static void test_async_HttpSendRequestEx(void)

1 0

Thomas Mullaly : urlmon/tests: Added pluggable protocol tests for CoInternetGetSecurityUrlEx.
by Alexandre Julliard Jan. 21, 2011

Jan. 21, 2011

Module: wine Branch: master Commit: 9d4a843d58103c92e8d3140ef3237f3f9ac57878 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d4a843d58103c92e8d3140ef… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Mon Jan 17 15:31:56 2011 -0500 urlmon/tests: Added pluggable protocol tests for CoInternetGetSecurityUrlEx. --- dlls/urlmon/tests/sec_mgr.c | 272 ++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 271 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9d4a843d58103c92e8d31…

1 0

Andrew Nguyen : include: Add an extern C++ block around the property key equality operators.
by Alexandre Julliard Jan. 21, 2011

Jan. 21, 2011

Module: wine Branch: master Commit: 2d12be7df9dd695794a71b246336b299207f8fcb URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d12be7df9dd695794a71b246… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Fri Jan 21 04:58:23 2011 -0600 include: Add an extern C++ block around the property key equality operators. --- include/propkeydef.h | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/include/propkeydef.h b/include/propkeydef.h index 2a796ea..ab8a7e6 100644 --- a/include/propkeydef.h +++ b/include/propkeydef.h @@ -58,6 +58,9 @@ #ifndef _PROPERTYKEY_EQUALITY_OPERATORS_ #define _PROPERTYKEY_EQUALITY_OPERATORS_ #ifdef __cplusplus +extern "C++" +{ + inline bool operator==(REFPROPERTYKEY guidOne, REFPROPERTYKEY guidOther) { return IsEqualPropertyKey(guidOne, guidOther); @@ -66,5 +69,7 @@ inline bool operator!=(REFPROPERTYKEY guidOne, REFPROPERTYKEY guidOther) { return !(guidOne == guidOther); } + +} #endif #endif

1 0

Thomas Mullaly : urlmon: Added basic CoInternetGetSecurityUrlEx implementation.
by Alexandre Julliard Jan. 21, 2011

Jan. 21, 2011

Module: wine Branch: master Commit: 540a56a66ecb94c5bde084dca084a73b074cb94c URL: http://source.winehq.org/git/wine.git/?a=commit;h=540a56a66ecb94c5bde084dca… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Sun Jan 16 23:40:08 2011 -0500 urlmon: Added basic CoInternetGetSecurityUrlEx implementation. --- dlls/urlmon/sec_mgr.c | 33 +++++++++++++++++++++++++++++++-- dlls/urlmon/tests/sec_mgr.c | 21 +++++++++++---------- 2 files changed, 42 insertions(+), 12 deletions(-) diff --git a/dlls/urlmon/sec_mgr.c b/dlls/urlmon/sec_mgr.c index 547f735..89669f9 100644 --- a/dlls/urlmon/sec_mgr.c +++ b/dlls/urlmon/sec_mgr.c @@ -26,6 +26,9 @@ #include "winreg.h" #include "wininet.h" +#define NO_SHLWAPI_REG +#include "shlwapi.h" + #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(urlmon); @@ -1332,11 +1335,37 @@ HRESULT WINAPI CoInternetGetSecurityUrl(LPCWSTR pwzUrl, LPWSTR *ppwzSecUrl, PSUA */ HRESULT WINAPI CoInternetGetSecurityUrlEx(IUri *pUri, IUri **ppSecUri, PSUACTION psuAction, DWORD_PTR dwReserved) { + HRESULT hres; + BSTR secure_uri; + URL_SCHEME scheme_type; + TRACE("(%p,%p,%u,%u)\n", pUri, ppSecUri, psuAction, (DWORD)dwReserved); if(!pUri || !ppSecUri) return E_INVALIDARG; - FIXME("(%p,%p,%u,%u)\n", pUri, ppSecUri, psuAction, (DWORD)dwReserved); - return E_NOTIMPL; + hres = IUri_GetScheme(pUri, (DWORD*)&scheme_type); + if(FAILED(hres)) + return hres; + + hres = IUri_GetDisplayUri(pUri, &secure_uri); + if(FAILED(hres)) + return hres; + + /* File URIs have to hierarchical. */ + if(scheme_type == URL_SCHEME_FILE) { + const WCHAR *tmp = secure_uri; + + /* Check and see if a "//" is after the scheme name. */ + tmp += sizeof(fileW)/sizeof(WCHAR); + if(*tmp != '/' || *(tmp+1) != '/') { + SysFreeString(secure_uri); + return E_INVALIDARG; + } + } + + hres = CreateUri(secure_uri, Uri_CREATE_ALLOW_IMPLICIT_WILDCARD_SCHEME, 0, ppSecUri); + SysFreeString(secure_uri); + + return hres; } diff --git a/dlls/urlmon/tests/sec_mgr.c b/dlls/urlmon/tests/sec_mgr.c index 5d6dca3..bbf0e39 100644 --- a/dlls/urlmon/tests/sec_mgr.c +++ b/dlls/urlmon/tests/sec_mgr.c @@ -719,16 +719,17 @@ static const struct { HRESULT default_hres; BOOL todo; } sec_url_ex_tests[] = { - {"index.htm",Uri_CREATE_ALLOW_RELATIVE,"*:index.html",S_OK,"*:index.htm",S_OK,TRUE}, - {"file://c:\\Index.htm",Uri_CREATE_FILE_USE_DOS_PATH,"file:///c:/Index.htm",S_OK,"file:///c:/Index.htm",S_OK,TRUE}, - {"file:some%20file%2ejpg",0,NULL,E_INVALIDARG,NULL,E_INVALIDARG,TRUE}, - {"http://www.zone3.winetest/",0,"http://www.zone3.winetest/",S_OK,"http://www.zone3.winetest/",S_OK,TRUE}, - {"about:blank",0,"about:blank",S_OK,"about:blank",S_OK,TRUE}, - {"ftp://zone3.winetest/file.test",0,"ftp://zone3.winetest/file.test",S_OK,"ftp://zone3.winetest/file.test",S_OK,TRUE}, - {"test:123abc",0,"test:123abc",S_OK,"test:123abc",S_OK,TRUE}, - {"http:google.com/test.file",0,"http:google.com/test.file",S_OK,"http:google.com/test.file",S_OK,TRUE}, - {"ftp://test(a)ftp.winehq.org/",0,"ftp://ftp.winehq.org/",S_OK,"ftp://ftp.winehq.org/",S_OK,TRUE}, - {"test://google(a)ftp.winehq.org/",0,"test://google(a)ftp.winehq.org/",S_OK,"test://google(a)ftp.winehq.org/",S_OK,TRUE} + {"index.htm",Uri_CREATE_ALLOW_RELATIVE,"*:index.html",S_OK,"*:index.htm",S_OK}, + {"file://c:\\Index.htm",Uri_CREATE_FILE_USE_DOS_PATH,"file:///c:/Index.htm",S_OK,"file:///c:/Index.htm",S_OK}, + {"file:some%20file%2ejpg",0,NULL,E_INVALIDARG,NULL,E_INVALIDARG}, + {"file:some file.jpg",0,NULL,E_INVALIDARG,NULL,E_INVALIDARG}, + {"http://www.zone3.winetest/",0,"http://www.zone3.winetest/",S_OK,"http://www.zone3.winetest/",S_OK}, + {"about:blank",0,"about:blank",S_OK,"about:blank",S_OK}, + {"ftp://zone3.winetest/file.test",0,"ftp://zone3.winetest/file.test",S_OK,"ftp://zone3.winetest/file.test",S_OK}, + {"test:123abc",0,"test:123abc",S_OK,"test:123abc",S_OK}, + {"http:google.com/test.file",0,"http:google.com/test.file",S_OK,"http:google.com/test.file",S_OK}, + {"ftp://test(a)ftp.winehq.org/",0,"ftp://ftp.winehq.org/",S_OK,"ftp://ftp.winehq.org/",S_OK}, + {"test://google(a)ftp.winehq.org/",0,"test://google(a)ftp.winehq.org/",S_OK,"test://google(a)ftp.winehq.org/",S_OK} }; static void test_InternetGetSecurityUrlEx(void)

1 0

Andrew Nguyen : regedit: Remove an unused string array.
by Alexandre Julliard Jan. 21, 2011

Jan. 21, 2011

Module: wine Branch: master Commit: 6c8f8a64b008c4126845085fd6d3fd895eb9ce88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c8f8a64b008c4126845085fd… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Fri Jan 21 04:58:31 2011 -0600 regedit: Remove an unused string array. Spotted by Austin English with LLVM/Clang. --- programs/regedit/regproc.c | 11 +++-------- 1 files changed, 3 insertions(+), 8 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index edf3d00..ff97970 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -37,20 +37,15 @@ */ #define REG_FILE_HEX_LINE_LEN (2 + 25 * 3) -static const CHAR *reg_class_names[] = { - "HKEY_LOCAL_MACHINE", "HKEY_USERS", "HKEY_CLASSES_ROOT", - "HKEY_CURRENT_CONFIG", "HKEY_CURRENT_USER", "HKEY_DYN_DATA" - }; - -#define REG_CLASS_NUMBER (sizeof(reg_class_names) / sizeof(reg_class_names[0])) - extern const WCHAR* reg_class_namesW[]; -static HKEY reg_class_keys[REG_CLASS_NUMBER] = { +static HKEY reg_class_keys[] = { HKEY_LOCAL_MACHINE, HKEY_USERS, HKEY_CLASSES_ROOT, HKEY_CURRENT_CONFIG, HKEY_CURRENT_USER, HKEY_DYN_DATA }; +#define REG_CLASS_NUMBER (sizeof(reg_class_keys) / sizeof(reg_class_keys[0])) + /* return values */ #define NOT_ENOUGH_MEMORY 1 #define IO_ERROR 2

1 0