November 2008 - Wine-commits

Henri Verbeet : wininet: Treat an empty username as NULL in FTP_Connect().
by Alexandre Julliard 18 Nov '08

18 Nov '08

Module: wine Branch: master Commit: 369da3aeb9d044866f53bc250768e18401027201 URL: http://source.winehq.org/git/wine.git/?a=commit;h=369da3aeb9d044866f53bc250… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 18 09:27:59 2008 +0100 wininet: Treat an empty username as NULL in FTP_Connect(). --- dlls/wininet/ftp.c | 4 ++-- dlls/wininet/tests/ftp.c | 23 +++++++++++++++++++++++ 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index cb24782..9ad34df 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -2256,7 +2256,7 @@ HINTERNET FTP_Connect(LPWININETAPPINFOW hIC, LPCWSTR lpszServerName, assert( hIC->hdr.htype == WH_HINIT ); - if (NULL == lpszUserName && NULL != lpszPassword) + if ((!lpszUserName || !strlenW(lpszUserName)) && lpszPassword) { INTERNET_SetLastError(ERROR_INVALID_PARAMETER); goto lerror; @@ -2302,7 +2302,7 @@ HINTERNET FTP_Connect(LPWININETAPPINFOW hIC, LPCWSTR lpszServerName, if(hIC->lpszProxyBypass) FIXME("Proxy bypass is ignored.\n"); } - if ( !lpszUserName) { + if (!lpszUserName || !strlenW(lpszUserName)) { HKEY key; WCHAR szPassword[MAX_PATH]; DWORD len = sizeof(szPassword); diff --git a/dlls/wininet/tests/ftp.c b/dlls/wininet/tests/ftp.c index 335215e..f7dc9c9 100644 --- a/dlls/wininet/tests/ftp.c +++ b/dlls/wininet/tests/ftp.c @@ -66,6 +66,8 @@ static void test_connect(HINTERNET hInternet) * anonymous : NULL * NULL : IEUser@ * NULL : NULL + * "" : IEUser@ + * "" : NULL */ SetLastError(0xdeadbeef); @@ -85,6 +87,13 @@ static void test_connect(HINTERNET hInternet) ok ( GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + SetLastError(0xdeadbeef); + hFtp = InternetConnect(hInternet, "ftp.winehq.org", INTERNET_DEFAULT_FTP_PORT, "", "IEUser@", + INTERNET_SERVICE_FTP, INTERNET_FLAG_PASSIVE, 0); + ok(!hFtp, "Expected InternetConnect to fail\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + /* Using a NULL username and password will be interpreted as anonymous ftp. The username will be 'anonymous' the password * is created via some simple heuristics (see dlls/wininet/ftp.c). * On Wine this registry key is not set by default so (NULL, NULL) will result in anonymous ftp with an (most likely) not @@ -103,6 +112,20 @@ static void test_connect(HINTERNET hInternet) ok ( hFtp != NULL, "InternetConnect failed : %d\n", GetLastError()); ok ( GetLastError() == ERROR_SUCCESS, "ERROR_SUCCESS, got %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + hFtp = InternetConnect(hInternet, "ftp.winehq.org", INTERNET_DEFAULT_FTP_PORT, "", NULL, + INTERNET_SERVICE_FTP, INTERNET_FLAG_PASSIVE, 0); + if (!hFtp) + { + ok(GetLastError() == ERROR_INTERNET_LOGIN_FAILURE, + "Expected ERROR_INTERNET_LOGIN_FAILURE, got %d\n", GetLastError()); + } + else + { + ok(GetLastError() == ERROR_SUCCESS, + "Expected ERROR_SUCCESS, got %d\n", GetLastError()); + } } static void test_createdir(HINTERNET hFtp, HINTERNET hConnect)

1 0

Hans Leidekker : winhttp: Add tests for WinHttpCrackUrl.
by Alexandre Julliard 18 Nov '08

18 Nov '08

Module: wine Branch: master Commit: 65c1e31dca0fc71cfaa756a87efb3e116cfa2544 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65c1e31dca0fc71cfaa756a87… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Nov 17 16:01:59 2008 +0100 winhttp: Add tests for WinHttpCrackUrl. --- dlls/winhttp/tests/url.c | 268 ++++++++++++++++++++++++++++++++++++---------- 1 files changed, 210 insertions(+), 58 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=65c1e31dca0fc71cfaa75…

1 0

Vincent Povirk : gdiplus: Restore a line I removed by mistake.
by Alexandre Julliard 18 Nov '08

18 Nov '08

Module: wine Branch: master Commit: 1a11131d15531f7fad2008461f3971a2c86d498a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a11131d15531f7fad2008461… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Nov 17 10:08:44 2008 -0600 gdiplus: Restore a line I removed by mistake. --- dlls/gdiplus/graphicspath.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 22b27e4..20a3b2c 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -994,6 +994,7 @@ GpStatus WINGDIPAPI GdipFlattenPath(GpPath *path, GpMatrix* matrix, REAL flatnes /* Bezier curve always stored as 4 points */ if((path->pathdata.Types[i-1] & PathPointTypePathTypeMask) != PathPointTypeStart){ + type = (path->pathdata.Types[i] & ~PathPointTypePathTypeMask) | PathPointTypeLine; if(!add_path_list_node(node, pt.X, pt.Y, type)) goto memout; @@ -1013,7 +1014,7 @@ GpStatus WINGDIPAPI GdipFlattenPath(GpPath *path, GpMatrix* matrix, REAL flatnes start = node; /* add Bezier end point */ - type = (path->pathdata.Types[i] & ~PathPointTypeBezier) | PathPointTypeLine; + type = (path->pathdata.Types[i] & ~PathPointTypePathTypeMask) | PathPointTypeLine; if(!add_path_list_node(node, pt.X, pt.Y, type)) goto memout; node = node->next;

1 0

Henri Verbeet : dxgi: Store an array of adapters in dxgi_factory.
by Alexandre Julliard 18 Nov '08

18 Nov '08

Module: wine Branch: master Commit: 808bbeb065073175a481659baae6eee4023be8d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=808bbeb065073175a481659ba… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 18 09:27:58 2008 +0100 dxgi: Store an array of adapters in dxgi_factory. --- dlls/dxgi/dxgi_main.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ dlls/dxgi/dxgi_private.h | 2 ++ dlls/dxgi/factory.c | 7 +++++++ 3 files changed, 54 insertions(+), 0 deletions(-) diff --git a/dlls/dxgi/dxgi_main.c b/dlls/dxgi/dxgi_main.c index 05476a5..a6dc5e6 100644 --- a/dlls/dxgi/dxgi_main.c +++ b/dlls/dxgi/dxgi_main.c @@ -80,6 +80,7 @@ HRESULT WINAPI CreateDXGIFactory(REFIID riid, void **factory) { struct dxgi_factory *object; HRESULT hr; + UINT i; TRACE("riid %s, factory %p\n", debugstr_guid(riid), factory); @@ -87,6 +88,7 @@ HRESULT WINAPI CreateDXGIFactory(REFIID riid, void **factory) if (!object) { ERR("Failed to allocate DXGI factory object memory\n"); + *factory = NULL; return E_OUTOFMEMORY; } @@ -95,7 +97,37 @@ HRESULT WINAPI CreateDXGIFactory(REFIID riid, void **factory) EnterCriticalSection(&dxgi_cs); object->wined3d = WineDirect3DCreate(10, (IUnknown *)object); + + object->adapter_count = IWineD3D_GetAdapterCount(object->wined3d); LeaveCriticalSection(&dxgi_cs); + object->adapters = HeapAlloc(GetProcessHeap(), 0, object->adapter_count * sizeof(*object->adapters)); + if (!object->adapters) + { + ERR("Failed to allocate DXGI adapter array memory\n"); + hr = E_OUTOFMEMORY; + goto fail; + } + + for (i = 0; i < object->adapter_count; ++i) + { + struct dxgi_adapter *adapter = HeapAlloc(GetProcessHeap(), 0, sizeof(**object->adapters)); + if (!adapter) + { + UINT j; + ERR("Failed to allocate DXGI adapter memory\n"); + for (j = 0; j < i; ++j) + { + HeapFree(GetProcessHeap(), 0, object->adapters[j]); + } + hr = E_OUTOFMEMORY; + goto fail; + } + + adapter->vtbl = &dxgi_adapter_vtbl; + adapter->refcount = 1; + adapter->ordinal = i; + object->adapters[i] = (IDXGIAdapter *)adapter; + } TRACE("Created IDXGIFactory %p\n", object); @@ -103,6 +135,19 @@ HRESULT WINAPI CreateDXGIFactory(REFIID riid, void **factory) IDXGIFactory_Release((IDXGIFactory *)object); return hr; + +fail: + HeapFree(GetProcessHeap(), 0, object->adapters); + if (object->wined3d) + { + EnterCriticalSection(&dxgi_cs); + IWineD3D_Release(object->wined3d); + LeaveCriticalSection(&dxgi_cs); + } + HeapFree(GetProcessHeap(), 0, object); + *factory = NULL; + return hr; + } static BOOL get_layer(enum dxgi_device_layer_id id, struct dxgi_device_layer *layer) diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 95dab26..25c54cb 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -46,6 +46,8 @@ struct dxgi_factory const struct IWineDXGIFactoryVtbl *vtbl; LONG refcount; IWineD3D *wined3d; + UINT adapter_count; + IDXGIAdapter **adapters; }; /* IDXGIDevice */ diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index a5f17e5..92b6cb5 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -65,6 +65,13 @@ static ULONG STDMETHODCALLTYPE dxgi_factory_Release(IWineDXGIFactory *iface) if (!refcount) { + UINT i; + + for (i = 0; i < This->adapter_count; ++i) + { + IDXGIAdapter_Release(This->adapters[i]); + } + EnterCriticalSection(&dxgi_cs); IWineD3D_Release(This->wined3d); LeaveCriticalSection(&dxgi_cs);

1 0

Alexandre Julliard : kernel32/test: Fix the timer queue tests on Vista.
by Alexandre Julliard 18 Nov '08

18 Nov '08

Module: wine Branch: master Commit: cf1116107f501cde9f96d7f2a5bb5ee5f02ecc17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf1116107f501cde9f96d7f2a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 17 23:01:21 2008 +0100 kernel32/test: Fix the timer queue tests on Vista. --- dlls/kernel32/tests/sync.c | 17 ++++++----------- 1 files changed, 6 insertions(+), 11 deletions(-) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index ade9b74..9f811bc 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -658,8 +658,7 @@ static void test_timer_queue(void) SetLastError(0xdeadbeef); ret = pDeleteTimerQueueEx(q, NULL); - ok(!ret, "DeleteTimerQueueEx call was expected to fail\n"); - ok(GetLastError() == ERROR_IO_PENDING, + ok(ret /* vista */ || GetLastError() == ERROR_IO_PENDING, "DeleteTimerQueueEx, GetLastError: expected ERROR_IO_PENDING, got %d\n", GetLastError()); @@ -771,8 +770,7 @@ static void test_timer_queue(void) even if the timer is finished. */ SetLastError(0xdeadbeef); ret = pDeleteTimerQueueTimer(q, t1, NULL); - ok(!ret, "DeleteTimerQueueTimer call was expected to fail\n"); - ok(GetLastError() == ERROR_IO_PENDING, + ok(ret /* vista */ || GetLastError() == ERROR_IO_PENDING, "DeleteTimerQueueTimer, GetLastError: expected ERROR_IO_PENDING, got %d\n", GetLastError()); @@ -803,8 +801,7 @@ static void test_timer_queue(void) SetLastError(0xdeadbeef); ret = pDeleteTimerQueueEx(q, e); - ok(!ret, "DeleteTimerQueueEx call was expected to fail\n"); - ok(GetLastError() == ERROR_IO_PENDING, + ok(ret /* vista */ || GetLastError() == ERROR_IO_PENDING, "DeleteTimerQueueEx, GetLastError: expected ERROR_IO_PENDING, got %d\n", GetLastError()); ok(WaitForSingleObject(e, 250) == WAIT_OBJECT_0, @@ -854,7 +851,7 @@ static void test_timer_queue(void) ok(ret, "CreateTimerQueueTimer\n"); ok(t4 != NULL, "CreateTimerQueueTimer\n"); - Sleep(200); + Sleep(500); ret = pDeleteTimerQueueEx(q, INVALID_HANDLE_VALUE); ok(ret, "DeleteTimerQueueEx\n"); @@ -881,8 +878,7 @@ static void test_timer_queue(void) SetLastError(0xdeadbeef); ret = pDeleteTimerQueueEx(q, NULL); - ok(!ret, "DeleteTimerQueueEx call was expected to fail\n"); - ok(GetLastError() == ERROR_IO_PENDING, + ok(ret /* vista */ || GetLastError() == ERROR_IO_PENDING, "DeleteTimerQueueEx, GetLastError: expected ERROR_IO_PENDING, got %d\n", GetLastError()); ok(d1.num_calls == 1, "DeleteTimerQueueTimer\n"); @@ -941,8 +937,7 @@ static void test_timer_queue(void) SetLastError(0xdeadbeef); ret = pDeleteTimerQueueEx(q, NULL); - ok(!ret, "DeleteTimerQueueEx call was expected to fail\n"); - ok(GetLastError() == ERROR_IO_PENDING, + ok(ret /* vista */ || GetLastError() == ERROR_IO_PENDING, "DeleteTimerQueueEx, GetLastError: expected ERROR_IO_PENDING, got %d\n", GetLastError()); }

1 0

Alexandre Julliard : kernel32/tests: Fix the mailslot tests on Vista.
by Alexandre Julliard 18 Nov '08

18 Nov '08

Module: wine Branch: master Commit: d68225eb4165a0f1d19e82858a50a55951baa86f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d68225eb4165a0f1d19e82858… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 17 23:36:47 2008 +0100 kernel32/tests: Fix the mailslot tests on Vista. --- dlls/kernel32/tests/mailslot.c | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/mailslot.c b/dlls/kernel32/tests/mailslot.c index 995f144..04c89e1 100644 --- a/dlls/kernel32/tests/mailslot.c +++ b/dlls/kernel32/tests/mailslot.c @@ -90,9 +90,9 @@ static int mailslot_test(void) /* now try and openthe client, but with the wrong sharing mode */ hWriter = CreateFile(szmspath, GENERIC_READ|GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL); - ok( hWriter == INVALID_HANDLE_VALUE, "bad sharing mode\n"); - ok( GetLastError() == ERROR_SHARING_VIOLATION, + ok( hWriter != INVALID_HANDLE_VALUE /* vista */ || GetLastError() == ERROR_SHARING_VIOLATION, "error should be ERROR_SHARING_VIOLATION\n"); + if (hWriter != INVALID_HANDLE_VALUE) CloseHandle( hWriter ); /* now open the client with the correct sharing mode */ hWriter = CreateFile(szmspath, GENERIC_READ|GENERIC_WRITE, @@ -139,17 +139,20 @@ static int mailslot_test(void) /* now try open another writer... should fail */ hWriter2 = CreateFile(szmspath, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); - ok( hWriter2 == INVALID_HANDLE_VALUE, "two writers\n"); + /* succeeds on vista, don't test */ + if (hWriter2 != INVALID_HANDLE_VALUE) CloseHandle( hWriter2 ); /* now try open another as a reader ... also fails */ hWriter2 = CreateFile(szmspath, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); - ok( hWriter2 == INVALID_HANDLE_VALUE, "writer + reader\n"); + /* succeeds on vista, don't test */ + if (hWriter2 != INVALID_HANDLE_VALUE) CloseHandle( hWriter2 ); /* now try open another as a writer ... still fails */ hWriter2 = CreateFile(szmspath, GENERIC_WRITE, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); - ok( hWriter2 == INVALID_HANDLE_VALUE, "writer\n"); + /* succeeds on vista, don't test */ + if (hWriter2 != INVALID_HANDLE_VALUE) CloseHandle( hWriter2 ); /* now open another one */ hSlot2 = CreateMailslot( szmspath, 0, 0, NULL ); @@ -172,7 +175,8 @@ static int mailslot_test(void) */ hWriter2 = CreateFile(szmspath, GENERIC_WRITE, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); - ok( hWriter2 == INVALID_HANDLE_VALUE, "greedy writer succeeded\n"); + /* succeeds on vista, don't test */ + if (hWriter2 != INVALID_HANDLE_VALUE) CloseHandle( hWriter2 ); /* now try open another as a writer ... and share with the first */ hWriter2 = CreateFile(szmspath, GENERIC_WRITE,

1 0

Alexandre Julliard : kernel32/tests: Fix the process tests on NT4.
by Alexandre Julliard 18 Nov '08

18 Nov '08

Module: wine Branch: master Commit: 1e02c1c3c89ee74f6d27ebedee7e1561863e7a94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e02c1c3c89ee74f6d27ebede… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 17 23:37:00 2008 +0100 kernel32/tests: Fix the process tests on NT4. --- dlls/kernel32/tests/process.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 40b8caf..a01d91b 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -501,7 +501,7 @@ static void test_Startup(void) PROCESS_INFORMATION info; STARTUPINFOA startup,si; static CHAR title[] = "I'm the title string", - desktop[] = "I'm the desktop string", + desktop[] = "winsta0\\default", empty[] = ""; /* let's start simplistic */ @@ -854,9 +854,9 @@ static void test_CommandLine(void) assert ( lpFilePart != 0); *(lpFilePart -1 ) = 0; p = strrchr(fullpath, '\\'); - assert (p); /* Use exename to avoid buffer containing things like 'C:' */ - sprintf(buffer, "..%s/%s tests/process.c %s \"a\\\"b\\\\\" c\\\" d", p, exename, resfile); + if (p) sprintf(buffer, "..%s/%s tests/process.c %s \"a\\\"b\\\\\" c\\\" d", p, exename, resfile); + else sprintf(buffer, "./%s tests/process.c %s \"a\\\"b\\\\\" c\\\" d", exename, resfile); SetLastError(0xdeadbeef); ret = CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info); ok(ret, "CreateProcess (%s) failed : %d\n", buffer, GetLastError()); @@ -864,7 +864,8 @@ static void test_CommandLine(void) ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination\n"); /* child process has changed result file, so let profile functions know about it */ WritePrivateProfileStringA(NULL, NULL, NULL, resfile); - sprintf(buffer, "..%s/%s", p, exename); + if (p) sprintf(buffer, "..%s/%s", p, exename); + else sprintf(buffer, "./%s", exename); okChildString("Arguments", "argvA0", buffer); release_memory(); assert(DeleteFileA(resfile) != 0); @@ -875,9 +876,9 @@ static void test_CommandLine(void) assert ( lpFilePart != 0); *(lpFilePart -1 ) = 0; p = strrchr(fullpath, '\\'); - assert (p); /* Use exename to avoid buffer containing things like 'C:' */ - sprintf(buffer, "..%s/%s", p, exename); + if (p) sprintf(buffer, "..%s/%s", p, exename); + else sprintf(buffer, "./%s", exename); sprintf(buffer2, "dummy tests/process.c %s \"a\\\"b\\\\\" c\\\" d", resfile); SetLastError(0xdeadbeef); ret = CreateProcessA(buffer, buffer2, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info);

1 0

Hans Leidekker : mlang: Implement IMultiLanguage2::ConvertStringInIStream.
by Alexandre Julliard 18 Nov '08

18 Nov '08

Module: wine Branch: master Commit: 5ce2dfcabb0616fdbf317f0599414773cc5278cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ce2dfcabb0616fdbf317f059… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Nov 17 16:01:32 2008 +0100 mlang: Implement IMultiLanguage2::ConvertStringInIStream. --- dlls/mlang/mlang.c | 38 ++++++++++++++++++++++++++++++++++++-- 1 files changed, 36 insertions(+), 2 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index ae85f6e..69ae690 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -2772,8 +2772,42 @@ static HRESULT WINAPI fnIMultiLanguage2_ConvertStringInIStream( IStream* pstmIn, IStream* pstmOut) { - FIXME("\n"); - return E_NOTIMPL; + char *src, *dst = NULL; + INT srclen, dstlen; + STATSTG stat; + HRESULT hr; + + TRACE("%p %0x8 %s %u %u %p %p\n", + pdwMode, dwFlag, debugstr_w(lpFallBack), dwSrcEncoding, dwDstEncoding, pstmIn, pstmOut); + + FIXME("dwFlag and lpFallBack not handled\n"); + + hr = IStream_Stat(pstmIn, &stat, STATFLAG_NONAME); + if (FAILED(hr)) return hr; + + if (stat.cbSize.QuadPart > MAXLONG) return E_INVALIDARG; + if (!(src = HeapAlloc(GetProcessHeap(), 0, stat.cbSize.QuadPart))) return E_OUTOFMEMORY; + + hr = IStream_Read(pstmIn, src, stat.cbSize.QuadPart, (ULONG *)&srclen); + if (FAILED(hr)) goto exit; + + hr = ConvertINetString(pdwMode, dwSrcEncoding, dwDstEncoding, src, &srclen, NULL, &dstlen); + if (FAILED(hr)) goto exit; + + if (!(dst = HeapAlloc(GetProcessHeap(), 0, dstlen))) + { + hr = E_OUTOFMEMORY; + goto exit; + } + hr = ConvertINetString(pdwMode, dwSrcEncoding, dwDstEncoding, src, &srclen, dst, &dstlen); + if (FAILED(hr)) goto exit; + + hr = IStream_Write(pstmOut, dst, dstlen, NULL); + +exit: + HeapFree(GetProcessHeap(), 0, src); + HeapFree(GetProcessHeap(), 0, dst); + return hr; } /*

1 0

Hans Leidekker : winhttp: Reimplement WinHttpCrackUrl.
by Alexandre Julliard 18 Nov '08

18 Nov '08

Module: wine Branch: master Commit: 2c850276a0fdde713a777816ef893d2702e58958 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c850276a0fdde713a777816e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Nov 17 16:01:48 2008 +0100 winhttp: Reimplement WinHttpCrackUrl. --- dlls/winhttp/Makefile.in | 2 +- dlls/winhttp/url.c | 165 ++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 139 insertions(+), 28 deletions(-) diff --git a/dlls/winhttp/Makefile.in b/dlls/winhttp/Makefile.in index 3d85c4d..40e8fa9 100644 --- a/dlls/winhttp/Makefile.in +++ b/dlls/winhttp/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = winhttp.dll IMPORTLIB = winhttp -IMPORTS = wininet kernel32 +IMPORTS = shlwapi kernel32 DELAYIMPORTS = crypt32 C_SRCS = \ diff --git a/dlls/winhttp/url.c b/dlls/winhttp/url.c index ac25f2c..41a46b7 100644 --- a/dlls/winhttp/url.c +++ b/dlls/winhttp/url.c @@ -23,55 +23,166 @@ #include "windef.h" #include "winbase.h" +#include "winreg.h" #include "winhttp.h" +#include "shlwapi.h" #include "winhttp_private.h" WINE_DEFAULT_DEBUG_CHANNEL(winhttp); -#define SCHEME_HTTP 3 -#define SCHEME_HTTPS 4 +static const WCHAR scheme_http[] = {'h','t','t','p',0}; +static const WCHAR scheme_https[] = {'h','t','t','p','s',0}; + +static BOOL set_component( WCHAR **str, DWORD *str_len, WCHAR *value, DWORD len ) +{ + if (!*str) + { + *str = value; + *str_len = len; + } + else + { + if (len > (*str_len) - 1) + { + *str_len = len + 1; + set_last_error( ERROR_INSUFFICIENT_BUFFER ); + return FALSE; + } + memcpy( *str, value, len * sizeof(WCHAR) ); + (*str)[len] = 0; + *str_len = len; + } + return TRUE; +} -BOOL WINAPI InternetCrackUrlW( LPCWSTR, DWORD, DWORD, LPURL_COMPONENTSW ); +static BOOL decode_url( LPCWSTR url, LPWSTR buffer, LPDWORD buflen ) +{ + HRESULT hr = UrlCanonicalizeW( url, buffer, buflen, URL_WININET_COMPATIBILITY | URL_UNESCAPE ); + if (hr == E_POINTER) set_last_error( ERROR_INSUFFICIENT_BUFFER ); + if (hr == E_INVALIDARG) set_last_error( ERROR_INVALID_PARAMETER ); + return (SUCCEEDED(hr)) ? TRUE : FALSE; +} /*********************************************************************** * WinHttpCrackUrl (winhttp.@) */ -BOOL WINAPI WinHttpCrackUrl( LPCWSTR url, DWORD len, DWORD flags, LPURL_COMPONENTSW components ) +BOOL WINAPI WinHttpCrackUrl( LPCWSTR url, DWORD len, DWORD flags, LPURL_COMPONENTSW uc ) { - BOOL ret; - INT upLen; - INT exLen; + BOOL ret = FALSE; + WCHAR *p, *q, *r; + WCHAR *url_decoded = NULL; - TRACE("%s, %d, %x, %p\n", debugstr_w(url), len, flags, components); - upLen = components->dwUrlPathLength; - exLen = components->dwExtraInfoLength; + TRACE("%s, %d, %x, %p\n", debugstr_w(url), len, flags, uc); - if ((ret = InternetCrackUrlW( url, len, flags, components ))) + if (flags & ICU_ESCAPE) FIXME("flag ICU_ESCAPE not supported\n"); + + if (!url || !url[0] || !uc || uc->dwStructSize != sizeof(URL_COMPONENTS)) { - /* fix up an incompatibility between wininet and winhttp */ - if (components->nScheme == SCHEME_HTTP) components->nScheme = INTERNET_SCHEME_HTTP; - else if (components->nScheme == SCHEME_HTTPS) components->nScheme = INTERNET_SCHEME_HTTPS; - else + set_last_error( ERROR_INVALID_PARAMETER ); + return FALSE; + } + if (!len) len = strlenW( url ); + + if (flags & ICU_DECODE) + { + WCHAR *url_tmp; + DWORD url_len = len + 1; + + if (!uc->lpszScheme || !uc->lpszUserName || !uc->lpszPassword || + !uc->lpszHostName || !uc->lpszUrlPath || !uc-> lpszExtraInfo) { - set_last_error( ERROR_WINHTTP_UNRECOGNIZED_SCHEME ); + set_last_error( ERROR_INVALID_PARAMETER ); + return FALSE; + } + if (!(url_tmp = HeapAlloc( GetProcessHeap(), 0, url_len * sizeof(WCHAR) ))) + { + set_last_error( ERROR_OUTOFMEMORY ); return FALSE; } - if (!len) - len = lstrlenW(url); - /* WinHttpCrackUrl actually returns pointers to the end of the string for components, - other than UserName and Password, that are missing */ - if (upLen && components->lpszUrlPath == NULL) - components->lpszUrlPath = (LPWSTR)&url[len]; - if (exLen && components->lpszExtraInfo == NULL) - components->lpszExtraInfo = (LPWSTR)&url[len]; + memcpy( url_tmp, url, len * sizeof(WCHAR) ); + url_tmp[len] = 0; + if (!(url_decoded = HeapAlloc( GetProcessHeap(), 0, url_len * sizeof(WCHAR) ))) + { + HeapFree( GetProcessHeap(), 0, url_tmp ); + set_last_error( ERROR_OUTOFMEMORY ); + return FALSE; + } + if (decode_url( url_tmp, url_decoded, &url_len )) + { + len = url_len; + url = url_decoded; + } + HeapFree( GetProcessHeap(), 0, url_tmp ); + } + if (!(p = strchrW( url, ':' ))) return FALSE; + + if (p - url == 4 && !strncmpiW( url, scheme_http, 4 )) uc->nScheme = INTERNET_SCHEME_HTTP; + else if (p - url == 5 && !strncmpiW( url, scheme_https, 5 )) uc->nScheme = INTERNET_SCHEME_HTTPS; + else goto exit; + + if (!(set_component( &uc->lpszScheme, &uc->dwSchemeLength, (WCHAR *)url, p - url ))) goto exit; + + p++; /* skip ':' */ + if (!p[0] || p[0] != '/' || p[1] != '/') goto exit; + p += 2; + + if (!p[0]) goto exit; + if ((q = memchrW( p, '@', len - (p - url) ))) + { + if ((r = memchrW( p, ':', q - p ))) + { + if (!(set_component( &uc->lpszUserName, &uc->dwUserNameLength, p, r - p ))) goto exit; + r++; + if (!(set_component( &uc->lpszPassword, &uc->dwPasswordLength, r, q - r ))) goto exit; + } + else + { + if (!(set_component( &uc->lpszUserName, &uc->dwUserNameLength, p, q - p ))) goto exit; + if (!(set_component( &uc->lpszPassword, &uc->dwPasswordLength, NULL, 0 ))) goto exit; + } + p = q + 1; + } + else + { + if (!(set_component( &uc->lpszUserName, &uc->dwUserNameLength, NULL, 0 ))) goto exit; + if (!(set_component( &uc->lpszPassword, &uc->dwPasswordLength, NULL, 0 ))) goto exit; + } + if ((q = memchrW( p, '/', len - (p - url) ))) + { + if (!(set_component( &uc->lpszHostName, &uc->dwHostNameLength, p, q - p ))) goto exit; + + if ((r = memchrW( q, '?', len - (q - url) ))) + { + if (!(set_component( &uc->lpszUrlPath, &uc->dwUrlPathLength, q, r - q ))) goto exit; + if (!(set_component( &uc->lpszExtraInfo, &uc->dwExtraInfoLength, r, len - (r - url) ))) goto exit; + } + else + { + if (!(set_component( &uc->lpszUrlPath, &uc->dwUrlPathLength, q, len - (q - url) ))) goto exit; + if (!(set_component( &uc->lpszExtraInfo, &uc->dwExtraInfoLength, (WCHAR *)url + len, 0 ))) goto exit; + } + } + else + { + if (!(set_component( &uc->lpszHostName, &uc->dwHostNameLength, p, len - (p - url) ))) goto exit; + if (!(set_component( &uc->lpszUrlPath, &uc->dwUrlPathLength, (WCHAR *)url + len, 0 ))) goto exit; + if (!(set_component( &uc->lpszExtraInfo, &uc->dwExtraInfoLength, (WCHAR *)url + len, 0 ))) goto exit; } + + ret = TRUE; + + TRACE("scheme(%s) host(%s) path(%s) extra(%s)\n", + debugstr_wn( uc->lpszScheme, uc->dwSchemeLength ), + debugstr_wn( uc->lpszHostName, uc->dwHostNameLength ), + debugstr_wn( uc->lpszUrlPath, uc->dwUrlPathLength ), + debugstr_wn( uc->lpszExtraInfo, uc->dwExtraInfoLength )); + +exit: + HeapFree( GetProcessHeap(), 0, url_decoded ); return ret; } -static const WCHAR scheme_http[] = {'h','t','t','p',0}; -static const WCHAR scheme_https[] = {'h','t','t','p','s',0}; - static INTERNET_SCHEME get_scheme( const WCHAR *scheme, DWORD len ) { if (!strncmpW( scheme, scheme_http, len )) return INTERNET_SCHEME_HTTP;

1 0

Alexandre Julliard : wintrust: Fix a buffer overflow.
by Alexandre Julliard 18 Nov '08

18 Nov '08

Module: wine Branch: master Commit: 04eb1e6a63fdebfb0a3e2640ea37401b064999ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=04eb1e6a63fdebfb0a3e2640e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 17 17:08:40 2008 +0100 wintrust: Fix a buffer overflow. --- dlls/wintrust/wintrust_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wintrust/wintrust_main.c b/dlls/wintrust/wintrust_main.c index a4bfe75..f9d3329 100644 --- a/dlls/wintrust/wintrust_main.c +++ b/dlls/wintrust/wintrust_main.c @@ -757,7 +757,7 @@ static BOOL WINAPI WINTRUST_enumUsages(PCCRYPT_OID_INFO pInfo, void *pvArg) for (cUsages = 0, ptr = *usages; *ptr; ptr++, cUsages++) ; *usages = WINTRUST_ReAlloc((CRYPT_OID_INFO *)*usages, - (cUsages + 1) * sizeof(PCCRYPT_OID_INFO)); + (cUsages + 2) * sizeof(PCCRYPT_OID_INFO)); } if (*usages) {

1 0